From 87a9808bc2351b1d3980a3b6a9964594a9394c95 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Apr 2023 11:39:03 +0000 Subject: [PATCH 1/6] Update dependency psycopg2 to v2.9.6 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index a5e1639..2701f23 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -1,6 +1,6 @@ django-auth-ldap==4.2.0 django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.13.2 napalm==4.0.0 -psycopg2==2.9.5 +psycopg2==2.9.6 python3-saml==1.15.0 social-auth-core[all]==4.4.0 From 5d5b01f6b5b425211de84ddeb609adb058289b0f Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Thu, 6 Apr 2023 09:52:28 +0200 Subject: [PATCH 2/6] Fixed version conflicts for social-auth-core --- Dockerfile | 9 +++++++-- requirements-container.txt | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 56ba2d3..0e6e32c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \ libsasl2-dev \ libssl-dev \ libxml2-dev \ - libxml2-dev \ libxmlsec1 \ libxmlsec1-dev \ libxmlsec1-openssl \ @@ -31,7 +30,11 @@ RUN export DEBIAN_FRONTEND=noninteractive \ ARG NETBOX_PATH COPY ${NETBOX_PATH}/requirements.txt requirements-container.txt / -RUN sed -i -e '/psycopg2-binary/d' requirements.txt && \ +RUN sed -i -e '/psycopg2-binary/d' /requirements.txt && \ + # We need 'social-auth-core[all]' in the Docker image. But if we put it in our own requirements-container.txt + # we have potential version conflicts and the build will fail. + # That's why we just replace it in the original requirements.txt. + sed -i -e 's/social-auth-core\[openidconnect\]/social-auth-core\[all\]/g' /requirements.txt && \ /opt/netbox/venv/bin/pip install \ -r /requirements.txt \ -r /requirements-container.txt @@ -74,6 +77,8 @@ COPY --from=builder /opt/netbox/venv /opt/netbox/venv ARG NETBOX_PATH COPY ${NETBOX_PATH} /opt/netbox +# Copy the modified 'requirements*.txt' files, to have the files actually used to install +COPY --from=builder /requirements.txt /requirements-container.txt /opt/netbox/ COPY docker/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py COPY docker/ldap_config.docker.py /opt/netbox/netbox/netbox/ldap_config.py diff --git a/requirements-container.txt b/requirements-container.txt index 2701f23..2fd446a 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,3 @@ django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.13.2 napalm==4.0.0 psycopg2==2.9.6 python3-saml==1.15.0 -social-auth-core[all]==4.4.0 From 5a29364bca994e620d777ef7dd90c548b3f91bdd Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Thu, 6 Apr 2023 11:08:34 +0200 Subject: [PATCH 3/6] Fixed wording MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Christian Mäder --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0e6e32c..60589c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -77,7 +77,7 @@ COPY --from=builder /opt/netbox/venv /opt/netbox/venv ARG NETBOX_PATH COPY ${NETBOX_PATH} /opt/netbox -# Copy the modified 'requirements*.txt' files, to have the files actually used to install +# Copy the modified 'requirements*.txt' files, to have the files actually used during installation COPY --from=builder /requirements.txt /requirements-container.txt /opt/netbox/ COPY docker/configuration.docker.py /opt/netbox/netbox/netbox/configuration.py From e44f0398fb62d67b482cf83f03d6e7847647812d Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Thu, 6 Apr 2023 12:05:02 +0200 Subject: [PATCH 4/6] Try to get test on ARM64 to pass --- .github/workflows/push.yml | 5 +++++ docker-compose.test.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2bf855b..47b3112 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -75,6 +75,11 @@ jobs: env: BUILDX_PLATFORM: ${{ matrix.platform }} BUILDX_BUILDER_NAME: ${{ steps.buildx-setup.outputs.name }} + - id: arm-time-limit + name: Set Netbox container start_period higher on ARM64 + if: matrix.platform == 'linux/arm64' + run: | + echo "NETBOX_START_PERIOD=240s" >>"${GITHUB_ENV}" - id: docker-test name: Test the image run: IMAGE="${FINAL_DOCKER_TAG}" ./test.sh diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 6854e00..680c16c 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -14,7 +14,7 @@ services: volumes: - ./test-configuration/logging.py:/etc/netbox/config/logging.py:z,ro healthcheck: - start_period: 120s + start_period: ${NETBOX_START_PERIOD-120s} timeout: 3s interval: 15s test: "curl -f http://localhost:8080/api/ || exit 1" From 23a262d72f5a33c0ef17baf878868543b0b03d98 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 14 Apr 2023 19:16:09 +0000 Subject: [PATCH 5/6] Update github/super-linter action to v5 --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 47b3112..e7766db 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -23,7 +23,7 @@ jobs: with: python-version: '3.9' - name: Lint Code Base - uses: github/super-linter@v4 + uses: github/super-linter@v5 env: DEFAULT_BRANCH: develop GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From c698496e3688ee671bc6731dcf20e2b8721539fe Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Sat, 15 Apr 2023 01:16:40 +0200 Subject: [PATCH 6/6] Preparation for 2.5.3 --- VERSION | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index f225a78..aedc15b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5.2 +2.5.3 diff --git a/docker-compose.yml b/docker-compose.yml index d853726..c1038ca 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.4-2.5.2} + image: docker.io/netboxcommunity/netbox:${VERSION-v3.4-2.5.3} depends_on: - postgres - redis