Merge pull request #659 from netbox-community/develop

Version 1.5.1
This commit is contained in:
Tobias Genannt 2021-12-09 12:36:52 +01:00 committed by GitHub
commit 58a1579832
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 18 deletions

View File

@ -19,6 +19,8 @@ jobs:
fail-fast: false fail-fast: false
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Builds new NetBox Docker Images name: Builds new NetBox Docker Images
env:
GH_ACTION: enable
steps: steps:
- -
name: Checkout name: Checkout
@ -28,24 +30,10 @@ jobs:
run: | run: |
echo "::set-output name=version::$(cat VERSION)" echo "::set-output name=version::$(cat VERSION)"
shell: bash 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 id: docker-build
name: Build the image with '${{ matrix.build_cmd }}' name: Build the image with '${{ matrix.build_cmd }}'
run: ${{ matrix.build_cmd }} run: ${{ matrix.build_cmd }}
env:
GH_ACTION: enable
- -
name: Test the image name: Test the image
run: IMAGE="${FINAL_DOCKER_TAG}" ./test.sh run: IMAGE="${FINAL_DOCKER_TAG}" ./test.sh
@ -79,7 +67,6 @@ jobs:
run: ${{ matrix.build_cmd }} --push run: ${{ matrix.build_cmd }} --push
env: env:
DOCKER_REGISTRY: quay.io DOCKER_REGISTRY: quay.io
GH_ACTION: enable
if: steps.docker-build.outputs.skipped != 'true' if: steps.docker-build.outputs.skipped != 'true'
# ghcr.io # ghcr.io
@ -97,5 +84,4 @@ jobs:
env: env:
DOCKER_REGISTRY: ghcr.io DOCKER_REGISTRY: ghcr.io
DOCKER_ORG: netbox-community DOCKER_ORG: netbox-community
GH_ACTION: enable
if: steps.docker-build.outputs.skipped != 'true' if: steps.docker-build.outputs.skipped != 'true'

View File

@ -1 +1 @@
1.5.0 1.5.1

View File

@ -1,7 +1,7 @@
version: '3.4' version: '3.4'
services: services:
netbox: &netbox netbox: &netbox
image: netboxcommunity/netbox:${VERSION-v3.1-1.5.0} image: netboxcommunity/netbox:${VERSION-v3.1-1.5.1}
depends_on: depends_on:
- postgres - postgres
- redis - redis