Skip to content

Commit

Permalink
Merge pull request #659 from netbox-community/develop
Browse files Browse the repository at this point in the history
Version 1.5.1
  • Loading branch information
tobiasge authored Dec 9, 2021
2 parents b510862 + 6d5cf7a commit 58a1579
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 18 deletions.
18 changes: 2 additions & 16 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -97,5 +84,4 @@ jobs:
env:
DOCKER_REGISTRY: ghcr.io
DOCKER_ORG: netbox-community
GH_ACTION: enable
if: steps.docker-build.outputs.skipped != 'true'
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.0
1.5.1
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 58a1579

Please sign in to comment.