diff --git a/package/Dockerfile b/package/Dockerfile index 8205c59c1c..dc7e80fe72 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -19,7 +19,6 @@ ARG SYSLOGNG_VERSION=4.24.0 FROM ghcr.io/axoflow/axosyslog:${SYSLOGNG_VERSION} - RUN apk add -U --upgrade --no-cache \ bash \ binutils \ @@ -74,7 +73,10 @@ RUN python3 -m venv /var/lib/python-venv \ && poetry export --format requirements.txt | /var/lib/python-venv/bin/pip3 --no-cache-dir install -r /dev/stdin \ && rm -rf /var/lib/python-venv/lib/python3.*/site-packages/setuptools/_vendor/*.dist-info || true \ && rm -rf /var/lib/syslog-ng-venv/lib/python3.*/site-packages/setuptools/_vendor/*.dist-info || true \ - && apk del build-base python3-dev libffi-dev + && apk del build-base python3-dev libffi-dev cargo poetry py3-pip py3-poetry-plugin-export py3-virtualenv + +# Patch axosyslog dependencies for vulnerabilities +RUN /var/lib/syslog-ng-venv/bin/pip install --no-cache-dir "cryptography>=46.0.6" "requests>=2.33.0" COPY package/etc/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf COPY package/etc/conf.d /etc/syslog-ng/conf.d diff --git a/package/Dockerfile.lite b/package/Dockerfile.lite index ae81078f32..8a9e35feb3 100644 --- a/package/Dockerfile.lite +++ b/package/Dockerfile.lite @@ -19,7 +19,6 @@ ARG SYSLOGNG_VERSION=4.24.0 FROM ghcr.io/axoflow/axosyslog:${SYSLOGNG_VERSION} - RUN apk add -U --upgrade --no-cache \ bash \ binutils \ @@ -74,7 +73,10 @@ RUN python3 -m venv /var/lib/python-venv \ && poetry export --format requirements.txt | /var/lib/python-venv/bin/pip3 --no-cache-dir install -r /dev/stdin \ && rm -rf /var/lib/python-venv/lib/python3.*/site-packages/setuptools/_vendor/*.dist-info || true \ && rm -rf /var/lib/syslog-ng-venv/lib/python3.*/site-packages/setuptools/_vendor/*.dist-info || true \ - && apk del build-base python3-dev libffi-dev + && apk del build-base python3-dev libffi-dev cargo poetry py3-pip py3-poetry-plugin-export py3-virtualenv + +# Patch axosyslog dependencies for vulnerabilities +RUN /var/lib/syslog-ng-venv/bin/pip install --no-cache-dir "cryptography>=46.0.6" "requests>=2.33.0" COPY package/lite/etc/syslog-ng.conf.jinja /etc/syslog-ng/syslog-ng.conf.jinja