Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SYS-617 breaking-change Dockerfile updates for alpine 3.19 #144

Merged
merged 1 commit into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions images/postfix-python/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion images/proftpd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion images/samba-dc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion images/weewx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
Loading