Skip to content

Commit eee2e12

Browse files
Upgraded some base syslog libs in dockerfile (#3001)
* fix: patch axosyslog libs
1 parent 454ed15 commit eee2e12

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

package/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
ARG SYSLOGNG_VERSION=4.24.0
2020
FROM ghcr.io/axoflow/axosyslog:${SYSLOGNG_VERSION}
2121

22-
2322
RUN apk add -U --upgrade --no-cache \
2423
bash \
2524
binutils \
@@ -74,7 +73,10 @@ RUN python3 -m venv /var/lib/python-venv \
7473
&& poetry export --format requirements.txt | /var/lib/python-venv/bin/pip3 --no-cache-dir install -r /dev/stdin \
7574
&& rm -rf /var/lib/python-venv/lib/python3.*/site-packages/setuptools/_vendor/*.dist-info || true \
7675
&& rm -rf /var/lib/syslog-ng-venv/lib/python3.*/site-packages/setuptools/_vendor/*.dist-info || true \
77-
&& apk del build-base python3-dev libffi-dev
76+
&& apk del build-base python3-dev libffi-dev cargo poetry py3-pip py3-poetry-plugin-export py3-virtualenv
77+
78+
# Patch axosyslog dependencies for vulnerabilities
79+
RUN /var/lib/syslog-ng-venv/bin/pip install --no-cache-dir "cryptography>=46.0.6" "requests>=2.33.0"
7880

7981
COPY package/etc/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf
8082
COPY package/etc/conf.d /etc/syslog-ng/conf.d

package/Dockerfile.lite

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
ARG SYSLOGNG_VERSION=4.24.0
2020
FROM ghcr.io/axoflow/axosyslog:${SYSLOGNG_VERSION}
2121

22-
2322
RUN apk add -U --upgrade --no-cache \
2423
bash \
2524
binutils \
@@ -74,7 +73,10 @@ RUN python3 -m venv /var/lib/python-venv \
7473
&& poetry export --format requirements.txt | /var/lib/python-venv/bin/pip3 --no-cache-dir install -r /dev/stdin \
7574
&& rm -rf /var/lib/python-venv/lib/python3.*/site-packages/setuptools/_vendor/*.dist-info || true \
7675
&& rm -rf /var/lib/syslog-ng-venv/lib/python3.*/site-packages/setuptools/_vendor/*.dist-info || true \
77-
&& apk del build-base python3-dev libffi-dev
76+
&& apk del build-base python3-dev libffi-dev cargo poetry py3-pip py3-poetry-plugin-export py3-virtualenv
77+
78+
# Patch axosyslog dependencies for vulnerabilities
79+
RUN /var/lib/syslog-ng-venv/bin/pip install --no-cache-dir "cryptography>=46.0.6" "requests>=2.33.0"
7880

7981
COPY package/lite/etc/syslog-ng.conf.jinja /etc/syslog-ng/syslog-ng.conf.jinja
8082

0 commit comments

Comments
 (0)