From 0a6fba5374b259052cdeb4959f01e816d9edbd50 Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Halili Date: Thu, 27 Jul 2023 01:17:17 +0800 Subject: [PATCH 1/2] Update namespace paths since the slug rename behind the scenes Signed-off-by: Andrei Jiroh Halili --- .github/workflows/docker-ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml index 5a51b35..eaa95bf 100644 --- a/.github/workflows/docker-ci.yml +++ b/.github/workflows/docker-ci.yml @@ -13,6 +13,7 @@ on: paths: - "Dockerfile" - "vaultwarden-startup" + - "src/*" - ".github/workflows/docker-ci.yml" pull_request: branches: [ main ] @@ -20,7 +21,7 @@ on: env: RHQCR_NAMESPACE: recaptime-dev/vaultwarden - GITLAB_MAUDEV_NAMESPACE: recaptime/infra/docker/vaultwarden + GITLAB_MAUDEV_NAMESPACE: recaptime-dev/infra/docker/vaultwarden GHCR_NAMESPACE: recaptime-dev/vaultwarden-docker DOCKERHUB_NAMESPACE: ajhalili2006 # TODO: Update this before I add Docker Hub login stuff. @@ -79,9 +80,10 @@ jobs: images: | ghcr.io/${{ env.GHCR_NAMESPACE }} quay.io/${{ env.RHQCR_NAMESPACE }} + dock.mau.dev/ labels: | - org.opencontainers.image.vendor=Recap Time Squad - org.opencontainers.image.authors=Andrei Jiroh Halili + org.opencontainers.image.vendor=RecapTime.dev + org.opencontainers.image.authors=~ajhalili2006 org.opencontainers.image.title=RecapTime.dev's Vaultwarden Docker image org.opencontainers.image.description=Custom Vaultwarden image, as used by Recap Time Squad for their instance. tags: | From 883f8530c8056967148f60f45d322da96be1c031 Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Halili Date: Thu, 27 Jul 2023 01:52:15 +0800 Subject: [PATCH 2/2] Fix metadata generation flags Signed-off-by: Andrei Jiroh Halili --- .github/workflows/docker-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml index eaa95bf..33b64a0 100644 --- a/.github/workflows/docker-ci.yml +++ b/.github/workflows/docker-ci.yml @@ -80,7 +80,7 @@ jobs: images: | ghcr.io/${{ env.GHCR_NAMESPACE }} quay.io/${{ env.RHQCR_NAMESPACE }} - dock.mau.dev/ + dock.mau.dev/${{ env.GITLAB_MAUDEV_NAMESPACE }} labels: | org.opencontainers.image.vendor=RecapTime.dev org.opencontainers.image.authors=~ajhalili2006