From a216ae99b93e965d1380b9852624b12cd8830885 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Wed, 20 Jan 2021 17:43:59 +0000 Subject: [PATCH] Update to alpine:3.13 Signed-off-by: Joe Groocock --- .drone.star | 10 ++++------ Dockerfile | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.drone.star b/.drone.star index c6b45f3..d95b2f9 100644 --- a/.drone.star +++ b/.drone.star @@ -1,13 +1,14 @@ def main(ctx): return [ - step("3.9"), step("3.10"), step("3.11"), - step("3.12",["latest"]), + step("3.12"), + step("3.13",["latest"]), step("edge"), ] def step(alpinever,tags=[]): + vertest = "grep -q '%s' /etc/alpine-release && " % alpinever if alpinever != "edge" else "" return { "kind": "pipeline", "name": "build-%s" % alpinever, @@ -17,7 +18,6 @@ def step(alpinever,tags=[]): "image": "spritsail/docker-build", "pull": "always", "settings": { - "repo": "alpine-dev-%s" % alpinever, "build_args": [ "ALPINE_TAG=%s" % alpinever, ], @@ -28,8 +28,7 @@ def step(alpinever,tags=[]): "image": "spritsail/docker-test", "pull": "always", "settings": { - "repo": "spritsail/alpine", - "run": "su-exec nobody apk --version", + "run": vertest + "su-exec nobody apk --version", }, }, { @@ -37,7 +36,6 @@ def step(alpinever,tags=[]): "image": "spritsail/docker-publish", "pull": "always", "settings": { - "from": "alpine-dev-%s" % alpinever, "repo": "spritsail/alpine", "tags": [alpinever] + tags, "username": {"from_secret": "docker_username"}, diff --git a/Dockerfile b/Dockerfile index 80200d1..053c0ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG ALPINE_TAG=3.12 +ARG ALPINE_TAG=3.13 FROM alpine:$ALPINE_TAG