fix call to docker image

SAEON · Apr 4, 2024 · c162b1b · c162b1b
1 parent 3c16906
commit c162b1b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/build_images.yml b/.github/workflows/build_images.yml
@@ -72,9 +72,9 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
 
   pull-image-mims1:
-    needs: [build-and-push-image]
+    needs: [envs,build-and-push-image]
     runs-on: mims1
     steps:
       - name: pull latest docker image to mims server
         run: |
-          docker pull ${{ needs.build-and-push-image.outputs.image }}
+          docker pull ${{ needs.envs.outputs.IMAGE_NAME }}:latest
diff --git a/.github/workflows/prep_dirs.yml b/.github/workflows/prep_dirs.yml
@@ -44,20 +44,22 @@ jobs:
                 -rf {} \;
   setup-rundir:
     runs-on: ${{ inputs.RUNNER_NAME }}
+    env:
+      RUN_DIR: /home/somisana/${{ inputs.BRANCH_REF }}/${{ inputs.DOMAIN }}/${{ inputs.MODEL }}/${{ inputs.RUN_DATE }}
     steps:
       - name: create the directory
         run: |
-          rm -rf /home/somisana/${{ inputs.BRANCH_REF }}/${{ inputs.DOMAIN }}/${{ inputs.MODEL }}/${{ inputs.MODEL_RUN_DATE }}
-          mkdir -p /home/somisana/${{ inputs.BRANCH_REF }}/${{ inputs.DOMAIN }}/${{ inputs.MODEL }}/${{ inputs.MODEL_RUN_DATE }}
-          chown -R :runners /home/somisana/${{ inputs.BRANCH_REF }}/${{ inputs.DOMAIN }}/${{ inputs.MODEL }}/${{ inputs.MODEL_RUN_DATE }}
-          chmod -R 774 /home/somisana/${{ inputs.BRANCH_REF }}/${{ inputs.DOMAIN }}/${{ inputs.MODEL }}/${{ inputs.MODEL_RUN_DATE }}
+          rm -rf ${{ env.RUN_DIR }}
+          mkdir -p ${{ env.RUN_DIR }}
+          chown -R :runners ${{ env.RUN_DIR }}
+          chmod -R 774 ${{ env.RUN_DIR }}
 
       - name: copy configuration files from docker image
-        run: ->
+        run: >-
           docker run \
             --rm \
             --entrypoint /bin/bash \
-            -v /home/somisana/${{ inputs.BRANCH_REF }}/${{ inputs.DOMAIN }}/${{ inputs.MODEL }}/${{ inputs.MODEL_RUN_DATE }}:/tmp \
+            -v ${{ env.RUN_DIR }}:/tmp \
             ghcr.io/saeon/somisana-croco_run_main:latest \
             -c "cp -r /somisana-croco/configs/${{ inputs.DOMAIN }}/${{ inputs.MODEL }}/* /tmp/"