diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index e7766db7e..5a9528a60 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -14,12 +14,12 @@ jobs: runs-on: ubuntu-latest name: Checks syntax of our code steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # Full git history is needed to get a proper # list of changed files within `super-linter` fetch-depth: 0 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.9' - name: Lint Code Base @@ -62,13 +62,13 @@ jobs: steps: - id: git-checkout name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - id: qemu-setup name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - id: buildx-setup name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - id: docker-build name: Build the image for '${{ matrix.platform }}' with '${{ matrix.build_cmd }}' run: ${{ matrix.build_cmd }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1dd2c3af1..3021dab5e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,17 +30,17 @@ jobs: steps: - id: source-checkout name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - id: set-netbox-docker-version name: Get Version of NetBox Docker run: echo "version=$(cat VERSION)" >>"$GITHUB_OUTPUT" shell: bash - id: qemu-setup name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - id: buildx-setup name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - id: docker-build name: Build the image with '${{ matrix.build_cmd }}' run: ${{ matrix.build_cmd }} @@ -51,7 +51,7 @@ jobs: # docker.io - id: docker-io-login name: Login to docker.io - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: docker.io username: ${{ secrets.dockerhub_username }} @@ -60,7 +60,7 @@ jobs: # quay.io - id: quay-io-login name: Login to Quay.io - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: quay.io username: ${{ secrets.quayio_username }} @@ -69,7 +69,7 @@ jobs: # ghcr.io - id: ghcr-io-login name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} diff --git a/Dockerfile b/Dockerfile index 558f76462..c55c4c92c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,8 +74,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get update -qq \ && apt-get install \ --yes -qq --no-install-recommends \ - unit=1.30.0-1~lunar \ - unit-python3.11=1.30.0-1~lunar \ + unit=1.31.1-1~lunar \ + unit-python3.11=1.31.1-1~lunar \ && rm -rf /var/lib/apt/lists/* COPY --from=builder /opt/netbox/venv /opt/netbox/venv diff --git a/VERSION b/VERSION index 24ba9a38d..834f26295 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.7.0 +2.8.0 diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 0035f3268..8115afc43 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -39,7 +39,7 @@ services: interval: 15s test: "ps -aux | grep -v grep | grep -q housekeeping || exit 1" postgres: - image: postgres:15-alpine + image: postgres:16-alpine env_file: env/postgres.env healthcheck: test: "pg_isready -t 2 -d $$POSTGRES_DB -U $$POSTGRES_USER" ## $$ because of docker-compose diff --git a/docker-compose.yml b/docker-compose.yml index 38cd6582e..8b0ea61d2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: netbox: &netbox - image: docker.io/netboxcommunity/netbox:${VERSION-v3.6-2.7.0} + image: docker.io/netboxcommunity/netbox:${VERSION-v3.7-2.8.0} depends_on: - postgres - redis @@ -47,7 +47,7 @@ services: # postgres postgres: - image: docker.io/postgres:15-alpine + image: docker.io/postgres:16-alpine env_file: env/postgres.env volumes: - netbox-postgres-data:/var/lib/postgresql/data diff --git a/requirements-container.txt b/requirements-container.txt index 8ea63525a..870eee912 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -1,5 +1,5 @@ -django-auth-ldap==4.5.0 -django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.13.2 -dulwich==0.21.5 -psycopg[c,pool]==3.1.10 -python3-saml==1.15.0 +django-auth-ldap==4.6.0 +django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.2 +dulwich==0.21.7 +psycopg[c,pool]==3.1.16 +python3-saml==1.16.0