From 74c3570a119eee99d6d04d4cac1d0f0173aa64e0 Mon Sep 17 00:00:00 2001 From: burnettk Date: Sat, 13 May 2023 22:43:58 -0400 Subject: [PATCH] more screwing with labels --- .github/workflows/docker_image_for_main_builds.yml | 4 ++++ spiffworkflow-backend/Dockerfile | 1 - spiffworkflow-frontend/Dockerfile | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker_image_for_main_builds.yml b/.github/workflows/docker_image_for_main_builds.yml index f8a1162ed..f66a8441c 100644 --- a/.github/workflows/docker_image_for_main_builds.yml +++ b/.github/workflows/docker_image_for_main_builds.yml @@ -59,6 +59,8 @@ jobs: uses: docker/metadata-action@v4.4.0 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + labels: | + org.opencontainers.image.description=Frontend component of SpiffWorkflow, a software development platform for building, running, and monitoring executable diagrams tags: | type=ref,event=branch,suffix=-latest type=ref,event=branch,suffix=-${{ steps.date.outputs.date }} @@ -103,6 +105,8 @@ jobs: uses: docker/metadata-action@v4.4.0 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + labels: | + org.opencontainers.image.description=Backend component of SpiffWorkflow, a software development platform for building, running, and monitoring executable diagrams tags: | type=ref,event=branch,suffix=-latest type=ref,event=branch,suffix=-${{ steps.date.outputs.date }} diff --git a/spiffworkflow-backend/Dockerfile b/spiffworkflow-backend/Dockerfile index 5957709c0..9c518ed7d 100644 --- a/spiffworkflow-backend/Dockerfile +++ b/spiffworkflow-backend/Dockerfile @@ -43,7 +43,6 @@ FROM deployment AS final LABEL source="https://github.com/sartography/spiff-arena" LABEL description="Backend component of SpiffWorkflow, a software development platform for building, running, and monitoring executable diagrams" -LABEL org.opencontainers.image.description="Backend component of SpiffWorkflow, a software development platform for building, running, and monitoring executable diagrams" COPY --from=setup /app /app diff --git a/spiffworkflow-frontend/Dockerfile b/spiffworkflow-frontend/Dockerfile index 92c98f919..2bd02a0c6 100644 --- a/spiffworkflow-frontend/Dockerfile +++ b/spiffworkflow-frontend/Dockerfile @@ -29,7 +29,7 @@ RUN ./bin/build # Final image without setup dependencies. FROM base AS final -LABEL org.opencontainers.image.description="Frontend component of SpiffWorkflow, a software development platform for building, running, and monitoring executable diagrams" +LABEL description="Frontend component of SpiffWorkflow, a software development platform for building, running, and monitoring executable diagrams" # WARNING: On localhost frontend assumes backend is one port lowe. ENV PORT0=7001