From 444d0607366689857ff77c06af6671e48e240eb5 Mon Sep 17 00:00:00 2001 From: Ian Fijolek Date: Wed, 12 May 2021 23:22:24 +0000 Subject: [PATCH] Remove qemu-user-static from Dockerfile and update alpine My build machine now has proper qemu support added, so this is not needed --- Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f7c475..4dbbb8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,11 @@ ARG REPO=library -FROM multiarch/qemu-user-static:4.2.0-2 as qemu-user-static -FROM ${REPO}/alpine:3.10 - -# Copying all qemu files because amd64 doesn't exist and cannot condional copy -COPY --from=qemu-user-static /usr/bin/qemu-* /usr/bin/ +FROM ${REPO}/alpine:3.13 RUN mkdir /app WORKDIR /app/ # Add common checking tools -RUN apk --no-cache add bash=~5.0 curl=~7.66 jq=~1.6 +RUN apk --no-cache add bash=~5.1.0 curl=~7.76.1 jq=~1.6 # Add minitor user for running as non-root RUN addgroup -S minitor && adduser -S minitor -G minitor