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.

Sign up for GitHub

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

Vuln fix #2706

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Vuln fix #2706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9f32268
chores: vuln dependency
rjha-splunk Feb 13, 2025
1aba129
chores: vuln dependency
rjha-splunk Feb 13, 2025
ebd62db
Update ci-main.yaml
rjha-splunk Feb 13, 2025
dfd6cc7
chores: vuln dependency
rjha-splunk Feb 13, 2025
f7c86a7
chores: vuln dependency crptography
rjha-splunk Feb 13, 2025
ae416ca
chores: vuln dependency crptography remove
rjha-splunk Feb 13, 2025
f8fff16
chores: vuln dependency crptography remove
rjha-splunk Feb 13, 2025
44b43a4
chores: vuln dependency zipp and cryptography
rjha-splunk Feb 13, 2025
cfd5edb
chores: vuln dependency zipp and cryptography
rjha-splunk Feb 13, 2025
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 .github/workflows/ci-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
with:
semantic_version: 18
extra_plugins: |
@semantic-release/exec
@semantic-release/exec@6.0.3
@semantic-release/git
semantic-release-helm
@google/[email protected]
Expand Down Expand Up @@ -456,7 +456,7 @@ jobs:
with:
semantic_version: 18
extra_plugins: |
@semantic-release/exec
@semantic-release/exec@6.0.3
@semantic-release/git
semantic-release-helm
@google/[email protected]
Expand Down
11 changes: 8 additions & 3 deletions package/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.


ARG SYSLOGNG_VERSION=4.8.1
ARG SYSLOGNG_VERSION=4.9.0
FROM ghcr.io/axoflow/axosyslog:${SYSLOGNG_VERSION}


Expand All @@ -28,11 +28,11 @@ RUN apk add -U --upgrade --no-cache \
less \
net-tools \
netcat-openbsd \
"openssl>=3.3.2-r1" \
openssl \
postgresql-libs \
procps \
py3-pip \
python3 \
"python3>=3.12.9-r0" \
python3-dev \
libffi-dev \
shadow \
Expand Down Expand Up @@ -66,6 +66,11 @@ COPY poetry.lock /

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 \
&& /var/lib/python-venv/bin/pip3 install --no-cache-dir --upgrade tornado==6.4.2 \
&& /var/lib/python-venv/bin/pip3 install --no-cache-dir --upgrade cryptography \
&& /var/lib/python-venv/bin/pip3 install --no-cache-dir --upgrade zipp \
&& /var/lib/python-venv/bin/pip3 install --no-cache-dir --upgrade urllib3 \
&& /var/lib/python-venv/bin/pip3 install --no-cache-dir --upgrade certifi \
&& apk del build-base python3-dev libffi-dev

COPY package/etc/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf
Expand Down
2 changes: 1 addition & 1 deletion package/Dockerfile.lite
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.


ARG SYSLOGNG_VERSION=4.8.1
ARG SYSLOGNG_VERSION=4.9.0
FROM ghcr.io/axoflow/axosyslog:${SYSLOGNG_VERSION}


Expand Down
2 changes: 1 addition & 1 deletion package/etc/syslog-ng.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@version:4.8
@version:4.9


# syslog-ng configuration file.
Expand Down
2 changes: 1 addition & 1 deletion package/lite/etc/syslog-ng.conf.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@version:4.8
@version:4.9


# syslog-ng configuration file.
Expand Down
93 changes: 57 additions & 36 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ setuptools = "^73.0.1"
restricted-sqlitedict = "^1.0.0"
gunicorn = "^23.0.0"
flask = "^3.1.0"
tornado = "^6.4.2"


[tool.poetry.group.dev.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion tests/Dockerfile.nc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG SYSLOGNG_VERSION=4.8.1
ARG SYSLOGNG_VERSION=4.9.0
FROM ghcr.io/axoflow/axosyslog:${SYSLOGNG_VERSION}

RUN apk add -U netcat-openbsd
Loading