new registry and also hub.docker.com

This commit is contained in:
Wolfgang Hottgenroth 2020-09-25 11:01:31 +02:00
parent 3395557a99
commit 4e14e7507d
Signed by: wn
GPG Key ID: B586EAFCDF2F65F4
2 changed files with 11 additions and 5 deletions

View File

@ -4,7 +4,9 @@ stages:
- build - build
variables: 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: build:
stage: build stage: build
@ -14,9 +16,11 @@ build:
- docker - docker
script: script:
- VERSION=`cat VERSION` - VERSION=`cat VERSION`
- echo "Version is $VERSION" - docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:latest .
- docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION .
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker push $IMAGE_NAME:latest - docker push $IMAGE_NAME:latest
- docker push $IMAGE_NAME:$VERSION - 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

View File

@ -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 <woho@hottis.de>" LABEL Maintainer="Wolfgang Hottgenroth <woho@hottis.de>"
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 \ RUN \