adjust ci script
This commit is contained in:
@ -1,10 +1,11 @@
|
|||||||
image: docker:stable
|
image: registry.hottis.de/docker-bash:latest
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
|
|
||||||
variables:
|
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:
|
build:
|
||||||
stage: build
|
stage: build
|
||||||
@ -14,9 +15,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 $MY_REGISTRY_LOGIN -p $MY_REGISTRY_PASSWORD $MY_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
|
||||||
|
|
||||||
|
@ -1,9 +1,10 @@
|
|||||||
FROM debian:latest
|
FROM debian:buster
|
||||||
|
|
||||||
LABEL Maintainer="Wolfgang Hottgenroth <woho@hottis.de>"
|
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 \
|
RUN \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
|
Reference in New Issue
Block a user