adjust ci script

This commit is contained in:
2020-06-08 16:04:50 +00:00
parent 1d6746c360
commit 5d1fc5b540
2 changed files with 12 additions and 8 deletions

View File

@ -1,10 +1,11 @@
image: docker:stable
image: registry.hottis.de/docker-bash:latest
stages:
- build
variables:
IMAGE_NAME: registry.gitlab.com/wolutator/base-build-env
IMAGE_NAME: registry.hottis.de/base-build-env
HUB_IMAGE_NAME: wollud1969/base-build-env
build:
stage: build
@ -14,9 +15,11 @@ build:
- docker
script:
- VERSION=`cat VERSION`
- echo "Version is $VERSION"
- docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION .
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:latest .
- docker login -u $MY_REGISTRY_LOGIN -p $MY_REGISTRY_PASSWORD $MY_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

View File

@ -1,9 +1,10 @@
FROM debian:latest
FROM debian:buster
LABEL Maintainer="Wolfgang Hottgenroth <woho@hottis.de>"
LABEL ImageName="registry.gitlab.com/wolutator/base-build-env"
LABEL ImageName="registry.hottis.de/base-build-env"
LABEL AlternativeImageName="wollud1969/base-build-env"
ARG RELEASETOOL_URL="https://gitlab.com/wolutator/gitlabreleaseuploader/uploads/293514354c90df1c2c4cd2940240f91a/GitlabReleaseTool.zip"
ARG RELEASETOOL_URL="https://home.hottis.de/gitlab/wolutator/gitlabreleaseuploader/uploads/25ef4a3247a99a0dbaf6507dd9cba36e/GitlabReleaseTool.zip"
RUN \
apt-get update && \