Create branch-image.yml (#12)

ccfreiburg · Aug 9, 2024 · 51388bb · 51388bb
1 parent d4715a7
commit 51388bb
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.github/workflows/branch-image.yml b/.github/workflows/branch-image.yml
@@ -64,4 +64,8 @@ jobs:
           build-args: |
             BUILDTIME=${{ fromJSON(steps.docker_meta.outputs.json).labels['org.opencontainers.image.created'] }}
             VERSION=${{ fromJSON(steps.docker_meta.outputs.json).labels['org.opencontainers.image.version'] }}
-            REVISION=${{ fromJSON(steps.docker_meta.outputs.json).labels['org.opencontainers.image.revision'] }}
+<<<<<<< HEAD
+            REVISION=${{ fromJSON(steps.docker_meta.outputs.json).labels['org.opencontainers.image.revision'] }}
+=======
+            REVISION=${{ fromJSON(steps.docker_meta.outputs.json).labels['org.opencontainers.image.revision'] }}
+>>>>>>> bc98674 (Create branch-image.yml (#12))