diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 2e741f0..f868be9 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -31,7 +31,7 @@ jobs: password: ${{secrets.GH_PAT}} - name: 'Build Backend Image' run: | - docker build --build-arg VERSION=${{ env.IMAGE_TAG }} --build-arg GIT_COMMIT=${{ github.sha }} --build-arg GIT_TREE_STATE=clean -f backend.Dockerfile . --tag ghcr.io/${{github.actor}}/gorya-backend:${{ env.IMAGE_TAG }} + docker build --build-arg VERSION=${{ env.IMAGE_TAG }} --build-arg GIT_COMMIT=${{ github.sha }} --build-arg GIT_TREE_STATE=clean --build-arg GH_ACTOR=${{github.actor}} --build-arg GH_REPO=${{ github.event.repository.name }} -f backend.Dockerfile . --tag ghcr.io/${{github.actor}}/gorya-backend:${{ env.IMAGE_TAG }} docker push ghcr.io/${{github.actor}}/gorya-backend:${{ env.IMAGE_TAG }} ui_image_publish: @@ -52,5 +52,5 @@ jobs: password: ${{secrets.GH_PAT}} - name: 'Build UI Image' run: | - docker build -f frontend.Dockerfile . --tag ghcr.io/${{github.actor}}/gorya-ui:${{ env.IMAGE_TAG }} + docker build --build-arg GH_ACTOR=${{github.actor}} --build-arg GH_REPO=${{ github.event.repository.name }} -f frontend.Dockerfile . --tag ghcr.io/${{github.actor}}/gorya-ui:${{ env.IMAGE_TAG }} docker push ghcr.io/${{github.actor}}/gorya-ui:${{ env.IMAGE_TAG }} diff --git a/backend.Dockerfile b/backend.Dockerfile index 1dada34..858ea3a 100644 --- a/backend.Dockerfile +++ b/backend.Dockerfile @@ -1,6 +1,9 @@ FROM cgr.dev/chainguard/go AS builder ARG TARGETOS ARG TARGETARCH +ARG GH_ACTOR +ARG GH_REPO +LABEL org.opencontainers.image.source=https://github.com/${GH_ACTOR}/${GH_REPO} ARG VERSION_PACKAGE=github.com/nduyphuong/gorya/internal/version @@ -17,4 +20,3 @@ RUN cd /app && GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build \ FROM cgr.dev/chainguard/glibc-dynamic COPY --from=builder /app/gorya /usr/bin/ CMD ["/usr/bin/gorya", "api"] - diff --git a/frontend.Dockerfile b/frontend.Dockerfile index 79c4b5d..cd427c9 100644 --- a/frontend.Dockerfile +++ b/frontend.Dockerfile @@ -1,5 +1,6 @@ # pull official base image FROM node:current-alpine3.18 +LABEL org.opencontainers.image.source=https://github.com/${GH_ACTOR}/${GH_REPO} ENV NODE_OPTIONS=--openssl-legacy-provider # set working directory