From 9f2a4f0ba68f2e264496366ebc80532717901b74 Mon Sep 17 00:00:00 2001 From: Jose Quintana Date: Sun, 21 Jan 2024 00:04:34 +0100 Subject: [PATCH] chore: alpine 3.18.5 update --- docker/alpine/Dockerfile | 22 +++++++++++++++++++--- docker/devel/Dockerfile.alpine | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index c367444..998b704 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -1,10 +1,11 @@ -FROM --platform=$BUILDPLATFORM alpine:3.17.6 as build +FROM --platform=$BUILDPLATFORM alpine:3.18.5 as build ARG TARGETPLATFORM ARG SERVER_VERSION=0.0.0 ENV SERVER_VERSION=${SERVER_VERSION} -RUN apk --no-cache add ca-certificates tzdata +RUN apk --no-cache add ca-certificates tzdata file + RUN set -ex; \ case "$TARGETPLATFORM" in \ "linux/amd64") target='x86_64-unknown-linux-musl' ;; \ @@ -22,7 +23,22 @@ RUN set -ex; \ 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.17.6 +RUN set -ex \ + && echo "Testing Docker image..." \ + && uname -a \ + && cat /etc/os-release \ + && case "$TARGETPLATFORM" in \ + **ppc64*|*s390x*) \ + echo "warn: can not run sws binary on $TARGETPLATFORM architecture" ;; \ + *) \ + static-web-server --version; \ + static-web-server --help; \ + ;; \ + esac \ + && file /usr/local/bin/static-web-server \ + && true + +FROM alpine:3.18.5 ARG SERVER_VERSION=0.0.0 ENV SERVER_VERSION=${SERVER_VERSION} diff --git a/docker/devel/Dockerfile.alpine b/docker/devel/Dockerfile.alpine index 13e768b..80655d3 100644 --- a/docker/devel/Dockerfile.alpine +++ b/docker/devel/Dockerfile.alpine @@ -1,4 +1,4 @@ -FROM alpine:3.17.6 +FROM alpine:3.18.5 ENV SERVER_VERSION=devel -- libgit2 1.7.2