SYS-617 breaking-change Dockerfile updates for alpine 3.19

instantlinux · Dec 19, 2023 · 9c2c57d · 9c2c57d
1 parent 02cbb23
commit 9c2c57d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/images/postfix-python/Dockerfile b/images/postfix-python/Dockerfile
@@ -22,7 +22,7 @@ ENV BLACKLIST_USER_SECRET=mysql-blacklist-user \
 
 ARG GETPIP_SHA=311afebb7cdd310eb3a3a6bb6fffef53d84493db98c7cebf4008a18d3418c8be
 ARG GETPIP_URI=https://bootstrap.pypa.io/pip/3.5/get-pip.py
-ARG PYTHON_PIP_VERSION=23.1.2
+ARG PYTHON_PIP_VERSION=23.3.2
 
 COPY requirements.txt /root/
 COPY src/ /usr/local/bin/
@@ -36,7 +36,7 @@ RUN apk add --no-cache --update \
       pip==$PYTHON_PIP_VERSION && \
     apk add --no-cache --virtual .fetch-deps \
       gcc git freetype-dev jpeg-dev musl-dev zlib-dev && \
-    pip install -r /root/requirements.txt && \
+    pip install -r /root/requirements.txt --break-system-packages && \
     chmod -R g+rx,o+rx /usr/local/bin && \
     adduser -S -u 2026 -g "Spamassassin" -s /bin/sh spamfilter && \
     addgroup spamfilter postdrop && \

diff --git a/images/proftpd/Dockerfile b/images/proftpd/Dockerfile
@@ -31,7 +31,7 @@ ENV ALLOW_OVERWRITE=on \
 COPY proftpd.conf.j2 /etc/proftpd/proftpd.conf
 RUN chmod 644 /etc/proftpd/proftpd.conf && \
     apk add --update \
-        libcrypto1.1 \
+        libcrypto3 \
         proftpd=$PROFTPD_VERSION \
         tzdata \
         proftpd-mod_sftp \

diff --git a/images/samba-dc/Dockerfile b/images/samba-dc/Dockerfile
@@ -29,7 +29,7 @@ ARG SAMBA_VERSION=4.18.9-r0
 COPY *.conf.j2 /root/
 COPY entrypoint.sh /usr/local/bin/
 RUN apk add --update --no-cache krb5 ldb-tools samba-dc=$SAMBA_VERSION samba-winbind-clients=$SAMBA_VERSION tdb \
-      bind bind-libs bind-tools libcrypto1.1 libxml2 tzdata py3-setuptools py3-pip && \
+      bind bind-libs bind-tools libcrypto3 libxml2 tzdata py3-setuptools py3-pip && \
     pip install j2cli && \
     apk del py3-pip && \
     chmod 0755 /usr/local/bin/entrypoint.sh

diff --git a/images/weewx/Dockerfile b/images/weewx/Dockerfile
@@ -67,7 +67,7 @@ RUN apk add --no-cache --update \
     apk add --no-cache --virtual .fetch-deps \
       file freetype-dev g++ gawk gcc git jpeg-dev libpng-dev make musl-dev \
       py3-pip py3-wheel python3-dev zlib-dev && \
-    pip install -r /root/requirements.txt && \
+    pip install -r /root/requirements.txt --break-system-packages && \
     tar xf weewx.tar.gz --strip-components=1 && \
     cd /build && \
     ./setup.py build && ./setup.py install < /root/install-input.txt && \