From 4e14e7507de512ea2ff6cb6f0ad13f7110954f1f Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Fri, 25 Sep 2020 11:01:31 +0200 Subject: [PATCH] new registry and also hub.docker.com --- .gitlab-ci.yml | 10 +++++++--- Dockerfile | 6 ++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b3fbe6..7e30390 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,9 @@ stages: - build variables: - IMAGE_NAME: registry.gitlab.com/wolutator/build-env-java + IMAGE_NAME: registry.hottis.de/dockerized/build-env-java + HUB_IMAGE_NAME: wollud1969/build-env-java + build: stage: build @@ -14,9 +16,11 @@ build: - docker script: - VERSION=`cat VERSION` - - echo "Version is $VERSION" - - docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION . + - docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:latest . - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker push $IMAGE_NAME:latest - docker push $IMAGE_NAME:$VERSION + - docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD + - docker push $HUB_IMAGE_NAME:latest + - docker push $HUB_IMAGE_NAME:$VERSION diff --git a/Dockerfile b/Dockerfile index 00504f2..3b816bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,9 @@ -FROM registry.gitlab.com/wolutator/base-build-env:latest +FROM registry.hottis.de/dockerized/base-build-env:latest LABEL Maintainer="Wolfgang Hottgenroth " -LABEL ImageName="registry.gitlab.com/wolutator/build-env-java" +LABEL ImageName="registry.hottis.de/dockerized/build-env-java" +LABEL AlternativeImageName="wollud1969/build-env-java" + RUN \