diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c89219..9ddd71b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,25 +1,6 @@ -image: docker:stable +include: + - project: dockerized/commons + ref: master + file: gitlab-ci-template.yml -stages: - - build - -variables: - IMAGE_NAME: registry.hottis.de/dockerized/docker-bash - HUB_IMAGE_NAME: wollud1969/docker-bash - -build: - stage: build - tags: - - hottis - - linux - - docker - 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 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 diff --git a/CHANGELOG b/CHANGELOG index f266a93..33b6108 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ 2020-06-08 * initial changelog -* git added \ No newline at end of file +* git added + +2020-10-12 +* sed and awk added, busybox variants are not sufficient diff --git a/Dockerfile b/Dockerfile index 8557604..d18bd40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ LABEL AlternativeImageName="wollud1969/docker-bash" RUN \ - apk add --no-cache bash curl git python3 && \ + apk add --no-cache bash curl git python3 gawk sed && \ P=`pwd` && \ cd /usr/bin && \ ln -s python3 python && \ diff --git a/VERSION b/VERSION deleted file mode 100644 index 2eb3c4f..0000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.5 diff --git a/readme.md b/readme.md index 4ecd7ff..5b8bc55 100644 --- a/readme.md +++ b/readme.md @@ -4,7 +4,7 @@ This is a Docker image directly derived from the Docker image `docker`, which is I use it regularly within Gitlab CI runners. Most recently I was wondering why a specific bash feature (variable indirection) wasn't available in a CI script. The reason was simple: the Docker `docker` image doesn't contain `bash` at all. -This image now is derived from the Docker `docker` image and just adds the bash, curl, git and python. +This image now is derived from the Docker `docker` image and just adds the bash, sed, gawk, curl, git and python. I would say: Use it the same way as the original image, you just have the additional stuff now.