Publish in rw repo mode

smecalculus · Feb 23, 2024 · 24bf2de · 24bf2de
1 parent c81274e
commit 24bf2de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/beyond-doubt.yaml b/.github/workflows/beyond-doubt.yaml
@@ -102,6 +102,7 @@ jobs:
         run: >-
           docker run --rm
           --volume $(pwd):$(pwd)
+          --volume /var/run/docker.sock:/var/run/docker.sock
           --workdir $(pwd)/baker/ansible
           ${{ env.IMAGE_NAME }}:${{ matrix.env.dev }}
           ansible-playbook stacks.yaml -t build
@@ -114,8 +115,8 @@ jobs:
           path: stack/product/target/image-context
           if-no-files-found: ignore
 
-  stack-testing:
-    name: Stack testing (${{ matrix.shard }}, ${{ matrix.purpose }}, ${{ matrix.env.ops }})
+  stack-checking:
+    name: Stack checking (${{ matrix.shard }}, ${{ matrix.purpose }}, ${{ matrix.env.ops }})
     timeout-minutes: 15
     needs: [stack-building]
     strategy:
@@ -170,7 +171,7 @@ jobs:
   stack-publishing:
     name: Stack publishing (${{ matrix.purpose }}, ${{ matrix.env.ops }})
     timeout-minutes: 10
-    needs: [stack-testing]
+    needs: [stack-checking]
     strategy:
       fail-fast: false
       matrix:
@@ -216,7 +217,7 @@ jobs:
   stack-reporting:
     name: Stack reporting
     timeout-minutes: 5
-    needs: [stack-testing]
+    needs: [stack-checking]
     if: ${{ !cancelled() && (contains(needs.*.result, 'success') || contains(needs.*.result, 'failure')) }}
     runs-on: ubuntu-22.04
     permissions:

diff --git a/app/pom.xml b/app/pom.xml
@@ -128,9 +128,9 @@
               <argument>--file</argument>
               <argument>${project.basedir}/Dockerfile</argument>
               <argument>--tag</argument>
-              <argument>app/${artifactId}:${devenv}</argument>
+              <argument>app/${project.artifactId}:${devenv}</argument>
               <argument>--label</argument>
-              <argument>image.key=app/${artifactId}/${devenv}</argument>
+              <argument>image.key=app/${project.artifactId}/${devenv}</argument>
               <argument>--build-arg</argument>
               <argument>JAVA_RELEASE=${maven.compiler.release}</argument>
             </arguments>

diff --git a/baker/ansible/roles/image/tasks/publish.yaml b/baker/ansible/roles/image/tasks/publish.yaml
@@ -19,4 +19,4 @@
     strip_empty_ends: false
   changed_when: true
   loop: "{{ image_target_tags }}"
-  tags: [never]
+  when: repo_mode == 'rw'