Skip to content
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
6 changes: 4 additions & 2 deletions package/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions package/Dockerfile.lite
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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

Expand Down
Loading