Merge pull request #92 from at88mph/release-jun-2022

Reformat automated build.
opencadc · May 27, 2022 · 0849f7f · 0849f7f
2 parents 456fde9 + d403100
commit 0849f7f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -1,8 +1,6 @@
 name: Reusable Docker workflow
 
 env:
-  CI_REGISTRY_ORGANIZATION: opencadc
-
   # Allow the set-env command below
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
@@ -20,6 +18,8 @@ on:
         required: true
       CI_REGISTRY_PASSWORD:
         required: true
+      CI_REGISTRY_ORGANIZATION:
+        required: true
 
 jobs:
   docker-build-publish:
@@ -50,7 +50,7 @@ jobs:
       -
         name: Set Docker tag
         run: |
-          TAG=${CI_REGISTRY_ORGANIZATION}/alma-${{ inputs.name }}:"$(gradle -b ${{ inputs.name }}/build.gradle -q printVersion)-SNAPSHOT"
+          TAG=${{ secrets.CI_REGISTRY_ORGANIZATION }}/alma-${{ inputs.name }}:"$(gradle -b ${{ inputs.name }}/build.gradle -q printVersion)"
           echo "::set-env name=DOCKER_TAG::$TAG"
       -
         name: Build and push