From 2456a642b7d1ac61aa9918e35576c8b94c27cf1b Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Thu, 9 Dec 2021 10:31:09 +0100 Subject: [PATCH 1/2] Fixed release action workflow --- .github/workflows/release.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fcce752..51e90b2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,6 +19,8 @@ jobs: fail-fast: false runs-on: ubuntu-latest name: Builds new NetBox Docker Images + env: + GH_ACTION: enable steps: - name: Checkout @@ -28,24 +30,10 @@ jobs: run: | echo "::set-output name=version::$(cat VERSION)" shell: bash - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - id: buildx-setup - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - with: - install: true - - - name: Available platforms - run: echo ${{ steps.buildx-setup.outputs.platforms }} - id: docker-build name: Build the image with '${{ matrix.build_cmd }}' run: ${{ matrix.build_cmd }} - env: - GH_ACTION: enable - name: Test the image run: IMAGE="${FINAL_DOCKER_TAG}" ./test.sh @@ -79,7 +67,6 @@ jobs: run: ${{ matrix.build_cmd }} --push env: DOCKER_REGISTRY: quay.io - GH_ACTION: enable if: steps.docker-build.outputs.skipped != 'true' # ghcr.io @@ -97,5 +84,4 @@ jobs: env: DOCKER_REGISTRY: ghcr.io DOCKER_ORG: netbox-community - GH_ACTION: enable if: steps.docker-build.outputs.skipped != 'true' From 6d5cf7a8156fe81afe0c85c8aef5851db4a0ffda Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Thu, 9 Dec 2021 12:15:26 +0100 Subject: [PATCH 2/2] Preparation for 1.5.1 --- VERSION | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index bc80560..26ca594 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.0 +1.5.1 diff --git a/docker-compose.yml b/docker-compose.yml index 10365ae..3b68f08 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: netbox: &netbox - image: netboxcommunity/netbox:${VERSION-v3.1-1.5.0} + image: netboxcommunity/netbox:${VERSION-v3.1-1.5.1} depends_on: - postgres - redis