From 78a5611bf922925b10edcaa2bc677a43d69b49da Mon Sep 17 00:00:00 2001 From: Jose Quintana Date: Mon, 4 Jul 2022 22:53:16 +0200 Subject: [PATCH] feat: alpine 3.16 docker images --- docker/alpine/Dockerfile | 26 +++++++++++++------------- docker/devel/Dockerfile.alpine | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index 8261a7d..24b8933 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM alpine:3.15 as build +FROM --platform=$BUILDPLATFORM alpine:3.16 as build ARG TARGETPLATFORM ARG SERVER_VERSION=0.0.0 @@ -6,21 +6,21 @@ ENV SERVER_VERSION=${SERVER_VERSION} RUN apk --no-cache add ca-certificates tzdata RUN set -ex; \ - case "$TARGETPLATFORM" in \ - "linux/amd64") target='x86_64-unknown-linux-musl' ;; \ - "linux/arm64") target='aarch64-unknown-linux-musl' ;; \ - "linux/386") target='i686-unknown-linux-musl' ;; \ - "linux/arm/v7") target='armv7-unknown-linux-musleabihf' ;; \ - "linux/arm/v6") target='arm-unknown-linux-musleabihf' ;; \ - *) echo >&2 "error: unsupported $TARGETPLATFORM architecture"; exit 1 ;; \ - esac; \ - wget --quiet -O /tmp/static-web-server.tar.gz "https://github.com/joseluisq/static-web-server/releases/download/v${SERVER_VERSION}/static-web-server-v${SERVER_VERSION}-${target}.tar.gz"; \ + case "$TARGETPLATFORM" in \ + "linux/amd64") target='x86_64-unknown-linux-musl' ;; \ + "linux/arm64") target='aarch64-unknown-linux-musl' ;; \ + "linux/386") target='i686-unknown-linux-musl' ;; \ + "linux/arm/v7") target='armv7-unknown-linux-musleabihf' ;; \ + "linux/arm/v6") target='arm-unknown-linux-musleabihf' ;; \ + *) echo >&2 "error: unsupported $TARGETPLATFORM architecture"; exit 1 ;; \ + esac; \ + wget --quiet -O /tmp/static-web-server.tar.gz "https://github.com/joseluisq/static-web-server/releases/download/v${SERVER_VERSION}/static-web-server-v${SERVER_VERSION}-${target}.tar.gz"; \ tar xzvf /tmp/static-web-server.tar.gz; \ cp static-web-server-v${SERVER_VERSION}-${target}/static-web-server /usr/local/bin/; \ - rm -rf /tmp/static-web-server.tar.gz static-web-server-v${SERVER_VERSION}-${target}; \ - chmod +x /usr/local/bin/static-web-server + rm -rf /tmp/static-web-server.tar.gz static-web-server-v${SERVER_VERSION}-${target}; \ + chmod +x /usr/local/bin/static-web-server -FROM alpine:3.15 +FROM alpine:3.16 ARG SERVER_VERSION=0.0.0 ENV SERVER_VERSION=${SERVER_VERSION} diff --git a/docker/devel/Dockerfile.alpine b/docker/devel/Dockerfile.alpine index f240883..4861e1a 100644 --- a/docker/devel/Dockerfile.alpine +++ b/docker/devel/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM alpine:3.15 +FROM alpine:3.16 ENV SERVER_VERSION=devel -- libgit2 1.7.2