From 896dd88b3b0476332e8b3e3021d1220fe3316a49 Mon Sep 17 00:00:00 2001 From: Jocelyn Le Sage Date: Sun, 2 Jan 2022 17:15:42 -0500 Subject: [PATCH] Updated baseimage to version 2.4.6 and use one based on Alpine 3.15. --- Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8f91c7f..3214ca5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ # # Pull base image. -FROM jlesage/baseimage:alpine-3.12-v2.4.5 +FROM jlesage/baseimage:alpine-3.15-v2.4.6 # Docker image version is provided via build arg. ARG DOCKER_IMAGE_VERSION=unknown @@ -210,11 +210,11 @@ RUN \ curl -# -L "https://bootstrap.pypa.io/get-pip.py" | python3 && \ # Then install certbot. CARGO_HOME=/tmp/.cargo pip install --no-cache-dir --prefix=/usr certbot && \ - find /usr/lib/python3.8/site-packages -type f -name "*.so" -exec strip {} ';' && \ - find /usr/lib/python3.8/site-packages -type f -name "*.h" -delete && \ - find /usr/lib/python3.8/site-packages -type f -name "*.c" -delete && \ - find /usr/lib/python3.8/site-packages -type f -name "*.exe" -delete && \ - find /usr/lib/python3.8/site-packages -type d -name tests -print0 | xargs -0 rm -r && \ + find /usr/lib/python3.9/site-packages -type f -name "*.so" -exec strip {} ';' && \ + find /usr/lib/python3.9/site-packages -type f -name "*.h" -delete && \ + find /usr/lib/python3.9/site-packages -type f -name "*.c" -delete && \ + find /usr/lib/python3.9/site-packages -type f -name "*.exe" -delete && \ + find /usr/lib/python3.9/site-packages -type d -name tests -print0 | xargs -0 rm -r && \ # Cleanup. del-pkg build-dependencies && \ rm -rf /tmp/* /tmp/.[!.]* @@ -228,6 +228,7 @@ RUN \ patch \ yarn \ git \ + python2 \ python3 \ npm \ bash \