From 324eda25e0d5fe4ec77a004ae455ba4539afab5a Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 14 Aug 2022 17:27:45 +0200 Subject: [PATCH 1/2] Added support to publish docker image in GHCR --- .github/workflows/docker-image-build.yml | 23 +++++------------------ CHANGELOG.md | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/docker-image-build.yml index f02beff1..aad2fefb 100644 --- a/.github/workflows/docker-image-build.yml +++ b/.github/workflows/docker-image-build.yml @@ -1,4 +1,4 @@ -name: Build docker image +name: Build and publish docker image on: push: @@ -9,20 +9,7 @@ on: jobs: build: - runs-on: ubuntu-20.04 - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - with: - version: latest - - name: Login to docker hub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - name: Build the image - run: bash ./scripts/docker/build + uses: shlinkio/github-actions/.github/workflows/docker-build-and-publish.yml@main + secrets: inherit + with: + build-and-publish-script: bash ./scripts/docker/build diff --git a/CHANGELOG.md b/CHANGELOG.md index f2dd09fe..6034fab1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org). +## [Unreleased] +### Added +* [#703](https://github.com/shlinkio/shlink-web-client/issues/703) Added support to publish docker image in GHCR. + +### Changed +* *Nothing* + +### Deprecated +* *Nothing* + +### Removed +* *Nothing* + +### Fixed +* *Nothing* + + ## [3.7.2] - 2022-08-07 ### Added * [#671](https://github.com/shlinkio/shlink-web-client/issues/671) Added proper color-scheme in root element based on selected theme. From c918eaf903e375aed0abb82178939bee1e547e18 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Sun, 14 Aug 2022 17:29:01 +0200 Subject: [PATCH 2/2] Added GHCR publishing in docker build script --- scripts/docker/build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/docker/build b/scripts/docker/build index 1a39c9cb..21dce541 100755 --- a/scripts/docker/build +++ b/scripts/docker/build @@ -8,15 +8,15 @@ DOCKER_IMAGE="shlinkio/shlink-web-client" if [[ "$GITHUB_REF" == *"develop"* ]]; then docker buildx build --push \ --platform ${PLATFORMS} \ - -t ${DOCKER_IMAGE}:latest . + -t ${DOCKER_IMAGE}:latest -t ghcr.io/${DOCKER_IMAGE}:latest . # If ref is not develop, then this is a tag. Build that docker tag and also "stable" else VERSION=${GITHUB_REF#refs/tags/v} - TAGS="-t ${DOCKER_IMAGE}:${VERSION}" + TAGS="-t ${DOCKER_IMAGE}:${VERSION} -t ghcr.io/${DOCKER_IMAGE}:${VERSION}" # Push stable tag only if this is not an alpha or beta release - [[ $GITHUB_REF != *"alpha"* && $GITHUB_REF != *"beta"* ]] && TAGS="${TAGS} -t ${DOCKER_IMAGE}:stable" + [[ $GITHUB_REF != *"alpha"* && $GITHUB_REF != *"beta"* ]] && TAGS="${TAGS} -t ${DOCKER_IMAGE}:stable -t ghcr.io/${DOCKER_IMAGE}:stable" docker buildx build --push \ --build-arg VERSION=${VERSION} \