Temporary 3.8 fix.

Waiting on https://github.com/docker-library/official-images/pull/4501
This commit is contained in:
Joe Groocock 2018-06-30 18:57:32 +01:00
parent 7853193403
commit 1ddb92853c
Signed by: frebib
GPG Key ID: E0B16BEACFBB6A86
2 changed files with 13 additions and 12 deletions

View File

@ -4,7 +4,7 @@ pipeline:
volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ] volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
repo: alpine-dev repo: alpine-dev
build_args: build_args:
- ALPINE_TAG=${ALPINE_TAG%%,*} - ALPINE_TAG=3.8
test: test:
image: docker image: docker
@ -14,7 +14,7 @@ pipeline:
publish: publish:
image: spritsail/docker-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' ] volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
secrets: [ docker_username, docker_password, microbadger_token ] secrets: [ docker_username, docker_password, microbadger_token ]
from: alpine-dev from: alpine-dev
@ -25,12 +25,3 @@ pipeline:
image: spritsail/notify image: spritsail/notify
when: { status: [ success, failure ] } when: { status: [ success, failure ] }
secrets: [ webhook_url, notify_token ] secrets: [ webhook_url, notify_token ]
matrix:
ALPINE_TAG:
- 3.4
- 3.5
- 3.6
- 3.7
- 3.8,latest
- edge

View File

@ -1,7 +1,17 @@
ARG SU_EXEC_VER=v0.3 ARG SU_EXEC_VER=v0.3
ARG ALPINE_TAG=3.8 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 SU_EXEC_VER
ARG ALPINE_TAG ARG ALPINE_TAG