Skip to content

Commit 5add31e

Browse files
authored
Merge pull request #1301 from netbox-community/develop
Version 3.0.1
2 parents ab2a7bc + 2d5c453 commit 5add31e

File tree

5 files changed

+25
-19
lines changed

5 files changed

+25
-19
lines changed

.github/workflows/release.yml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,11 @@ jobs:
3535
name: Get Version of NetBox Docker
3636
run: echo "version=$(cat VERSION)" >>"$GITHUB_OUTPUT"
3737
shell: bash
38-
- id: qemu-setup
39-
name: Set up QEMU
40-
uses: docker/setup-qemu-action@v3
41-
- id: buildx-setup
42-
name: Set up Docker Buildx
43-
uses: docker/setup-buildx-action@v3
44-
- id: docker-build
45-
name: Build the image with '${{ matrix.build_cmd }}'
38+
- id: check-build-needed
39+
name: Check if the build is needed for '${{ matrix.build_cmd }}'
40+
env:
41+
CHECK_ONLY: "true"
4642
run: ${{ matrix.build_cmd }}
47-
- id: test-image
48-
name: Test the image
49-
run: IMAGE="${FINAL_DOCKER_TAG}" ./test.sh
50-
if: steps.docker-build.outputs.skipped != 'true'
5143
# docker.io
5244
- id: docker-io-login
5345
name: Login to docker.io
@@ -56,7 +48,14 @@ jobs:
5648
registry: docker.io
5749
username: ${{ secrets.dockerhub_username }}
5850
password: ${{ secrets.dockerhub_password }}
59-
if: steps.docker-build.outputs.skipped != 'true'
51+
if: steps.check-build-needed.outputs.skipped != 'true'
52+
- id: buildx-setup
53+
name: Set up Docker Buildx
54+
uses: docker/setup-buildx-action@v3
55+
with:
56+
version: "lab:latest"
57+
driver: cloud
58+
endpoint: "netboxcommunity/netbox-default"
6059
# quay.io
6160
- id: quay-io-login
6261
name: Login to Quay.io
@@ -65,7 +64,7 @@ jobs:
6564
registry: quay.io
6665
username: ${{ secrets.quayio_username }}
6766
password: ${{ secrets.quayio_password }}
68-
if: steps.docker-build.outputs.skipped != 'true'
67+
if: steps.check-build-needed.outputs.skipped != 'true'
6968
# ghcr.io
7069
- id: ghcr-io-login
7170
name: Login to GitHub Container Registry
@@ -74,11 +73,11 @@ jobs:
7473
registry: ghcr.io
7574
username: ${{ github.repository_owner }}
7675
password: ${{ secrets.GITHUB_TOKEN }}
77-
if: steps.docker-build.outputs.skipped != 'true'
76+
if: steps.check-build-needed.outputs.skipped != 'true'
7877
- id: build-and-push
7978
name: Push the image
8079
run: ${{ matrix.build_cmd }} --push
81-
if: steps.docker-build.outputs.skipped != 'true'
80+
if: steps.check-build-needed.outputs.skipped != 'true'
8281
env:
8382
BUILDX_PLATFORM: ${{ matrix.platform }}
8483
BUILDX_BUILDER_NAME: ${{ steps.buildx-setup.outputs.name }}

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0
1+
3.0.1

build.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ GH_ACTION If defined, special 'echo' statements are enabled that set the
103103
- FINAL_DOCKER_TAG: The final value of the DOCKER_TAG env variable
104104
${_GREEN}Default:${_CLEAR} undefined
105105
106+
CHECK_ONLY Only checks if the build is needed and sets the GH Action output.
107+
106108
${_BOLD}Examples:${_CLEAR}
107109
108110
${0} master
@@ -355,6 +357,11 @@ else
355357
fi
356358
gh_echo "::endgroup::"
357359

360+
if [ "${CHECK_ONLY}" = "true" ]; then
361+
echo "Only check if build needed was requested. Exiting"
362+
exit 0
363+
fi
364+
358365
###
359366
# Build the image
360367
###

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
netbox: &netbox
3-
image: docker.io/netboxcommunity/netbox:${VERSION-v4.1-3.0.0}
3+
image: docker.io/netboxcommunity/netbox:${VERSION-v4.1-3.0.1}
44
depends_on:
55
- postgres
66
- redis

requirements-container.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ django-auth-ldap==4.8.0
22
django-storages[azure,boto3,dropbox,google,libcloud,sftp]==1.14.4
33
dulwich==0.22.1
44
python3-saml==1.16.0 --no-binary lxml,xmlsec
5-
sentry-sdk[django]==2.12.0
5+
sentry-sdk[django]==2.13.0

0 commit comments

Comments
 (0)