From d8fa20fdf9dc9811bbc4930c6070451a8a1d4d19 Mon Sep 17 00:00:00 2001 From: sverhoeven Date: Fri, 25 Oct 2024 11:09:36 +0200 Subject: [PATCH 1/3] Build haddock3-webapp-portal image --- .github/workflows/docker.yml | 36 ++++++++++++++++++++++++++++++++++++ deploy/README.md | 4 ++++ 2 files changed, 40 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index eb4c8827..2e420e10 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -125,6 +125,42 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max platforms: ${{startsWith(steps.meta.outputs.version, 'pr-') && 'linux/amd64' || 'linux/arm64,linux/amd64' }} + webapp4portal: + runs-on: ubuntu-latest + permissions: + packages: write + contents: read + steps: + - uses: actions/checkout@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ghcr.io/i-vresse/haddock3-webapp-portal + labels: | + org.opencontainers.image.description=Haddock3 web application image. + org.opencontainers.image.url=https://github.com/i-VRESSE/haddock3-webapp/blob/main/deploy/README.md#images + org.opencontainers.image.documentation.url=https://github.com/i-VRESSE/haddock3-webapp/blob/main/deploy/README.md#images + - name: Login to DockerHub + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v5 + with: + file: deploy/Dockerfile + push: true + tags: ${{ steps.meta.outputs.tags }} + build-args: + - HADDOCK3WEBAPP_PREFIX=/haddock3/ + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha + cache-to: type=gha,mode=max + platforms: 'linux/amd64' playwright: needs: - bartender diff --git a/deploy/README.md b/deploy/README.md index 33e53f24..41892e93 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -71,3 +71,7 @@ Generates a rsa private key (/certs/private_key.pem file) and public key (/certs ## haddock3-webapp image Haddock3 web application image. + +## haddock3-webapp-portal image + +Haddock3 web application image build with `/haddock3/` prefix. From 7b479986d42cd1cfa1f4a092334ba016d6c83241 Mon Sep 17 00:00:00 2001 From: sverhoeven Date: Fri, 25 Oct 2024 11:13:16 +0200 Subject: [PATCH 2/3] Correct build-args format --- .github/workflows/docker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2e420e10..5ccb1d31 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -155,8 +155,7 @@ jobs: file: deploy/Dockerfile push: true tags: ${{ steps.meta.outputs.tags }} - build-args: - - HADDOCK3WEBAPP_PREFIX=/haddock3/ + build-args: 'HADDOCK3WEBAPP_PREFIX=/haddock3/' labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max From 8164d503dad88665e19e2d8e74338dea3511dd14 Mon Sep 17 00:00:00 2001 From: sverhoeven Date: Fri, 25 Oct 2024 11:28:03 +0200 Subject: [PATCH 3/3] Format --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 5ccb1d31..2f9fe994 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -155,11 +155,11 @@ jobs: file: deploy/Dockerfile push: true tags: ${{ steps.meta.outputs.tags }} - build-args: 'HADDOCK3WEBAPP_PREFIX=/haddock3/' + build-args: "HADDOCK3WEBAPP_PREFIX=/haddock3/" labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max - platforms: 'linux/amd64' + platforms: "linux/amd64" playwright: needs: - bartender