This commit is contained in:
Wolfgang Hottgenroth 2020-06-08 14:44:07 +00:00
parent bd745eeb9d
commit 382a2caebe
4 changed files with 6 additions and 5 deletions

View File

@ -4,7 +4,7 @@ stages:
- build - build
variables: variables:
IMAGE_NAME: registry.gitlab.com/wolutator/docker-bash IMAGE_NAME: $MY_REGISTRY/docker-bash
HUB_IMAGE_NAME: wollud1969/docker-bash HUB_IMAGE_NAME: wollud1969/docker-bash
build: build:
@ -16,7 +16,7 @@ build:
script: script:
- VERSION=`cat VERSION` - VERSION=`cat 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 --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:latest
- docker push $IMAGE_NAME:$VERSION - docker push $IMAGE_NAME:$VERSION
- docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD - docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD

View File

@ -1,12 +1,12 @@
FROM docker:stable FROM docker:stable
LABEL Maintainer="Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>" LABEL Maintainer="Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>"
LABEL ImageName="registry.gitlab.com/wolutator/docker-bash" LABEL ImageName="registry.hottis.de/docker-bash"
LABEL AlternativeImageName="wollud1969/docker-bash" LABEL AlternativeImageName="wollud1969/docker-bash"
RUN \ RUN \
apk add --no-cache bash curl apk add --no-cache bash curl git
CMD [ "bash" ] CMD [ "bash" ]

View File

@ -1 +1 @@
0.2 0.3

View File

@ -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. I would say: Use it the same way as the original image, you just have the bash now.