From 3f2f085fd8cba7d9587ae820f462b0565f2bfe4d Mon Sep 17 00:00:00 2001 From: Andy Thompson Date: Tue, 18 Aug 2020 14:34:31 +0100 Subject: [PATCH 1/5] Build and push more up-to-date workspace In a leaner image with more recent tools added --- .travis.yml | 14 ++++++++++++++ Dockerfile | 44 ++++++++++++++++---------------------------- docker-compose.yml | 9 +++++++++ 3 files changed, 39 insertions(+), 28 deletions(-) create mode 100644 .travis.yml create mode 100644 docker-compose.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..b7df652 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,14 @@ +language: bash + +services: + - docker + +script: + - set -e + - docker-compose build + +after_success: + - | + if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] ; then + docker-compose push + fi diff --git a/Dockerfile b/Dockerfile index 4656a93..c2bc764 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,31 +1,19 @@ -FROM php:7.2-cli-stretch +FROM php:7.4-cli-alpine +ARG WS_VERSION +ARG HELM_VERSION=2.16.7 -# apply updates and install package depdendencies -RUN echo 'APT::Install-Recommends 0;' >> /etc/apt/apt.conf.d/01norecommends \ - && echo 'APT::Install-Suggests 0;' >> /etc/apt/apt.conf.d/01norecommends \ - && apt-get update -qq \ - && DEBIAN_FRONTEND=noninteractive apt-get -s dist-upgrade | grep "^Inst" | \ - grep -i securi | awk -F " " '{print $2}' | \ - xargs apt-get -qq -y --no-install-recommends install \ - \ - && DEBIAN_FRONTEND=noninteractive apt-get -qq -y --no-install-recommends install \ - apt-transport-https \ - git \ - awscli \ - && apt-get auto-remove -qq -y \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* +RUN apk add --no-cache aws-cli docker-cli bash docker-compose git openssh-client jq rsync -# install my127/workspace -RUN curl -L -o ws https://github.com/my127/workspace/releases/download/0.1.3/ws \ - && chmod +x ws \ - && mv ws /usr/local/bin/ws +RUN set -ex \ + # helm (for helm chart verification only) + && wget -O helm.tar.gz "https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz" \ + && tar -C /usr/local/bin --strip-components=1 -zxvf helm.tar.gz "linux-amd64/helm" \ + && rm ./helm.tar.gz \ + # kubeseal (development only) + && wget -O /usr/local/bin/kubeseal https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.12.5/kubeseal-linux-amd64 \ + && chmod +x /usr/local/bin/kubeseal \ + # workspace + && wget -O /usr/local/bin/ws "https://github.com/my127/workspace/releases/download/${WS_VERSION}/ws" \ + && chmod +x /usr/local/bin/ws -# install docker client binary -RUN curl -L -o docker-18.09.2.tgz https://download.docker.com/linux/static/stable/x86_64/docker-18.09.2.tgz \ - && tar -vzxf docker-18.09.2.tgz --strip=1 docker/docker \ - && rm -f docker-18.09.2.tgz \ - && mv docker /usr/local/bin/docker - -# initialise ws utility -RUN ws +ENTRYPOINT [ "/usr/local/bin/ws" ] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..01fbe16 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,9 @@ +version: '3' + +services: + v0.1.x: + image: my127/workspace:v0.1.x + build: + context: . + args: + WS_VERSION: 0.1.3 From 2670f9b606047f137aa119227be2d75f65428d42 Mon Sep 17 00:00:00 2001 From: andytson-inviqa Date: Tue, 18 Aug 2020 14:39:10 +0100 Subject: [PATCH 2/5] Shorten tag name --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 01fbe16..2d21014 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,8 @@ version: '3' services: - v0.1.x: - image: my127/workspace:v0.1.x + v0.1: + image: my127/workspace:0.1 build: context: . args: From 6d5b8b88a76b1b4fd1ea6894aaa6a0b1b8fedec2 Mon Sep 17 00:00:00 2001 From: andytson-inviqa Date: Tue, 18 Aug 2020 14:40:13 +0100 Subject: [PATCH 3/5] Apply suggestions from code review --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c2bc764..240ff52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,11 +5,11 @@ ARG HELM_VERSION=2.16.7 RUN apk add --no-cache aws-cli docker-cli bash docker-compose git openssh-client jq rsync RUN set -ex \ - # helm (for helm chart verification only) + # helm && wget -O helm.tar.gz "https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz" \ && tar -C /usr/local/bin --strip-components=1 -zxvf helm.tar.gz "linux-amd64/helm" \ && rm ./helm.tar.gz \ - # kubeseal (development only) + # kubeseal && wget -O /usr/local/bin/kubeseal https://github.com/bitnami-labs/sealed-secrets/releases/download/v0.12.5/kubeseal-linux-amd64 \ && chmod +x /usr/local/bin/kubeseal \ # workspace From 0e855cf65a808ffb2a8340d38a2bc5d8c584e534 Mon Sep 17 00:00:00 2001 From: andytson-inviqa Date: Wed, 6 Jan 2021 09:27:29 +0000 Subject: [PATCH 4/5] Update Dockerfile Co-authored-by: Kieren Evans --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 240ff52..20f1d78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM php:7.4-cli-alpine ARG WS_VERSION -ARG HELM_VERSION=2.16.7 +ARG HELM_VERSION=2.17.0 RUN apk add --no-cache aws-cli docker-cli bash docker-compose git openssh-client jq rsync From 5117c1dbaf0fc81f6ec68db6400d90ced7fc7381 Mon Sep 17 00:00:00 2001 From: Kieren Evans Date: Wed, 19 May 2021 09:48:29 +0300 Subject: [PATCH 5/5] Build 0.2.0-rc.1 --- docker-compose.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 2d21014..3134562 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,13 @@ version: '3' services: + v0.2: + image: my127/workspace:0.2 + build: + context: . + args: + WS_VERSION: 0.2.0-rc.1 + v0.1: image: my127/workspace:0.1 build: