From b92c652d99e2ad6e9db2fe24350f1562714f4109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ma=CC=88der?= Date: Tue, 15 Dec 2020 00:28:43 +0100 Subject: [PATCH] Add quay.io as fallback registry --- .github/workflows/release.yml | 31 +++++++++++++++++++++++++++++++ README.md | 7 ++++--- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9dbf770..32cc9ab 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,3 +50,34 @@ jobs: name: Logout of the Docker Registry run: docker logout "${DOCKER_REGISTRY}" if: steps.docker-build.outputs.skipped != 'true' + + # Quay.io + - id: quayio-docker-build + name: Build the image with '${{ matrix.build_cmd }}' + run: ${{ matrix.build_cmd }} + env: + DOCKER_REGISTRY: quay.io + GH_ACTION: enable + - id: quayio-registry-login + name: Login to the Quay.io Registry + run: | + echo "::add-mask::$QUAYIO_USERNAME" + echo "::add-mask::$QUAYIO_PASSWORD" + docker login -u "$QUAYIO_USERNAME" --password "${QUAYIO_PASSWORD}" "${DOCKER_REGISTRY}" + env: + DOCKER_REGISTRY: quay.io + QUAYIO_USERNAME: ${{ secrets.quayio_username }} + QUAYIO_PASSWORD: ${{ secrets.quayio_password }} + if: steps.docker-build.outputs.skipped != 'true' + - id: quayio-registry-push + name: Push the image + run: ${{ matrix.build_cmd }} --push-only + env: + DOCKER_REGISTRY: quay.io + if: steps.docker-build.outputs.skipped != 'true' + - id: quayio-registry-logout + name: Logout of the Docker Registry + run: docker logout "${DOCKER_REGISTRY}" + env: + DOCKER_REGISTRY: quay.io + if: steps.docker-build.outputs.skipped != 'true' diff --git a/README.md b/README.md index 7c4d20d..b7643ca 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ [![GitHub license](https://img.shields.io/github/license/netbox-community/netbox-docker)][netbox-docker-license] [The Github repository](netbox-docker-github) houses the components needed to build Netbox as a Docker container. -Images are built using this code and are released to [Docker Hub][netbox-dockerhub] once a day. +Images are built using this code and are released to [Docker Hub][netbox-dockerhub] and [Quay.io][netbox-quayio] once a day. Do you have any questions? Before opening an issue on Github, please join the [Network To Code][ntc-slack] Slack and ask for help in our [`#netbox-docker`][netbox-docker-slack] channel. @@ -18,11 +18,12 @@ Before opening an issue on Github, please join the [Network To Code][ntc-slack] [github-stargazers]: https://github.com/netbox-community/netbox-docker/stargazers [github-release]: https://github.com/netbox-community/netbox-docker/releases [netbox-docker-microbadger]: https://microbadger.com/images/netboxcommunity/netbox -[netbox-dockerhub]: https://hub.docker.com/r/netboxcommunity/netbox/tags/ +[netbox-dockerhub]: https://hub.docker.com/r/netboxcommunity/netbox/ [netbox-docker-github]: https://github.com/netbox-community/netbox-docker/ [ntc-slack]: http://slack.networktocode.com/ [netbox-docker-slack]: https://slack.com/app_redirect?channel=netbox-docker&team=T09LQ7E9E [netbox-docker-license]: https://github.com/netbox-community/netbox-docker/blob/release/LICENSE +[netbox-quayio]: https://quay.io/repository/netboxcommunity/netbox ## Docker Tags @@ -104,7 +105,7 @@ To check the version installed on your system run `docker --version` and `docker The `docker-compose.yml` file is prepared to run a specific version of Netbox, instead of `latest`. To use this feature, set and export the environment-variable `VERSION` before launching `docker-compose`, as shown below. `VERSION` may be set to the name of -[any tag of the `netboxcommunity/netbox` Docker image on Docker Hub][netbox-dockerhub]. +[any tag of the `netboxcommunity/netbox` Docker image on Docker Hub][netbox-dockerhub] or [Quay.io][netbox-quayio]. ```bash export VERSION=v2.7.1