diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7c27594..b90bf15 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,6 +56,7 @@ jobs: version: "lab:latest" driver: cloud endpoint: "netboxcommunity/netbox-default" + if: steps.check-build-needed.outputs.skipped != 'true' # quay.io - id: quay-io-login name: Login to Quay.io diff --git a/Dockerfile b/Dockerfile index 743bb4e..1c17caa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG FROM -FROM ${FROM} as builder +FROM ${FROM} AS builder RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get update -qq \ @@ -46,7 +46,7 @@ RUN \ ### ARG FROM -FROM ${FROM} as main +FROM ${FROM} AS main RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get update -qq \ @@ -64,15 +64,15 @@ RUN export DEBIAN_FRONTEND=noninteractive \ openssl \ python3 \ tini \ - && curl --silent --output /etc/apt/keyrings/nginx-keyring.gpg \ + && curl --silent --output /usr/share/keyrings/nginx-keyring.gpg \ https://unit.nginx.org/keys/nginx-keyring.gpg \ - && echo "deb [signed-by=/etc/apt/keyrings/nginx-keyring.gpg] https://packages.nginx.org/unit/ubuntu/ mantic unit" \ + && echo "deb [signed-by=/usr/share/keyrings/nginx-keyring.gpg] https://packages.nginx.org/unit/ubuntu/ noble unit" \ > /etc/apt/sources.list.d/unit.list \ && apt-get update -qq \ && apt-get install \ --yes -qq --no-install-recommends \ - unit=1.32.1-1~mantic \ - unit-python3.12=1.32.1-1~mantic \ + unit=1.33.0-1~noble \ + unit-python3.12=1.33.0-1~noble \ && rm -rf /var/lib/apt/lists/* COPY --from=builder /opt/netbox/venv /opt/netbox/venv diff --git a/VERSION b/VERSION index cb2b00e..b502146 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.1 +3.0.2 diff --git a/docker-compose.yml b/docker-compose.yml index 34ce41d..a00825c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: netbox: &netbox - image: docker.io/netboxcommunity/netbox:${VERSION-v4.1-3.0.1} + image: docker.io/netboxcommunity/netbox:${VERSION-v4.1-3.0.2} depends_on: - postgres - redis diff --git a/requirements-container.txt b/requirements-container.txt index fd97e0f..6dfd152 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -2,4 +2,4 @@ django-auth-ldap==4.8.0 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.4 dulwich==0.22.1 python3-saml==1.16.0 --no-binary lxml,xmlsec -sentry-sdk[django]==2.13.0 +sentry-sdk[django]==2.14.0