diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24f7518..571af48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: - build variables: - IMAGE_NAME: registry.gitlab.com/wolutator/docker-bash + IMAGE_NAME: $MY_REGISTRY/docker-bash HUB_IMAGE_NAME: wollud1969/docker-bash build: @@ -16,7 +16,7 @@ build: script: - VERSION=`cat 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 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 diff --git a/Dockerfile b/Dockerfile index 4f79a99..3f5d8fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ FROM docker:stable LABEL Maintainer="Wolfgang Hottgenroth " -LABEL ImageName="registry.gitlab.com/wolutator/docker-bash" +LABEL ImageName="registry.hottis.de/docker-bash" LABEL AlternativeImageName="wollud1969/docker-bash" RUN \ - apk add --no-cache bash curl + apk add --no-cache bash curl git CMD [ "bash" ] diff --git a/VERSION b/VERSION index 3b04cfb..be58634 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2 +0.3 diff --git a/readme.md b/readme.md index 485bdb7..2fb2657 100644 --- a/readme.md +++ b/readme.md @@ -8,3 +8,4 @@ This image now is derived from the Docker `docker` image and just adds the bash. I would say: Use it the same way as the original image, you just have the bash now. +