diff --git a/jenkins/docker-compose/jenkins/docker-compose.yaml b/jenkins/docker-compose/jenkins/docker-compose.yaml index 06ce821..c988210 100644 --- a/jenkins/docker-compose/jenkins/docker-compose.yaml +++ b/jenkins/docker-compose/jenkins/docker-compose.yaml @@ -5,7 +5,12 @@ services: - traefik.http.routers.jenkins.rule=Host(`jenkins.rschneider.net`) - traefik.http.routers.jenkins.tls=true - traefik.http.services.jenkins.loadbalancer.server.port=8080 - image: jenkins/jenkins + - traefik.http.routers.jenkins.service=jenkins + - traefik.http.routers.jenkins-public.rule=Host(`jenkins.rschneider.hu`) + - traefik.http.routers.jenkins-public.tls=true + - traefik.http.routers.jenkins-public.service=jenkins-public + - traefik.http.services.jenkins-public.loadbalancer.server.port=80 + image: docker.rschneider.hu/infra/jenkins:2.480-offical restart: always ports: - "4112:8080" diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile index 63e6dd4..f206991 100644 --- a/jenkins/docker/Dockerfile +++ b/jenkins/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM jenkins:2.60.3 +FROM jenkins/jenkins:2.480 # Install docker USER root @@ -14,7 +14,7 @@ ENV DOCKER_HOST=unix:///var/run/docker.sock # Give user `jenkins` permission to use the docker daemon. The group ID of the created `docker` # group matches with the ID of the docker group on the MMKB core server -RUN groupadd --gid 999 docker +RUN groupadd --gid 1001 docker RUN usermod -aG docker jenkins # Import the CA Certificate needed for company GitLab into the JVM TrustStore to make it known to Jenkins diff --git a/jenkins/docker/script/docker.build.sh b/jenkins/docker/script/docker.build.sh index cc2a286..baba7c2 100644 --- a/jenkins/docker/script/docker.build.sh +++ b/jenkins/docker/script/docker.build.sh @@ -3,7 +3,7 @@ CURRENT_DIR=$(dirname "$0") DOCKER_CONTEXT_DIR=$(readlink -f "$CURRENT_DIR/.."); -tag="nexus.rschneider.hu/repo1/infra/jenkins:1.0.1" +tag="docker.rschneider.hu/infra/jenkins:2.480-offical" -docker build --tag $tag . \ +docker build --tag $tag "${DOCKER_CONTEXT_DIR}" \ && docker push $tag