From 1ddb92853c7fd4658b7562944c300f28cd564c58 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Sat, 30 Jun 2018 18:57:32 +0100 Subject: [PATCH] Temporary 3.8 fix. Waiting on https://github.com/docker-library/official-images/pull/4501 --- .drone.yml | 13 ++----------- Dockerfile | 12 +++++++++++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index e9c4214..4238677 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,7 +4,7 @@ pipeline: volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ] repo: alpine-dev build_args: - - ALPINE_TAG=${ALPINE_TAG%%,*} + - ALPINE_TAG=3.8 test: image: docker @@ -14,7 +14,7 @@ pipeline: publish: image: spritsail/docker-publish - when: { branch: [ master ], event: [ push, tag, deployment ] } + when: { branch: [ 3.8 ], event: [ push, tag, deployment ] } volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ] secrets: [ docker_username, docker_password, microbadger_token ] from: alpine-dev @@ -25,12 +25,3 @@ pipeline: image: spritsail/notify when: { status: [ success, failure ] } secrets: [ webhook_url, notify_token ] - -matrix: - ALPINE_TAG: - - 3.4 - - 3.5 - - 3.6 - - 3.7 - - 3.8,latest - - edge diff --git a/Dockerfile b/Dockerfile index 6c23234..147c85d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,17 @@ ARG SU_EXEC_VER=v0.3 ARG ALPINE_TAG=3.8 -FROM alpine:$ALPINE_TAG +FROM alpine:3.7 AS upgrade + +ARG ALPINE_TAG +RUN sed -i "s/3\.7/${ALPINE_TAG}/g" /etc/apk/repositories \ + && apk --no-cache upgrade + +# ~~~~~~~~~~~~~~~~~~~~~~ + +FROM scratch + +COPY --from=upgrade / / ARG SU_EXEC_VER ARG ALPINE_TAG