Changed the yml file to use latest docker. (#754)

mdolab · Feb 1, 2025 · c2bdbe8 · c2bdbe8
1 parent cdb0ca9
commit c2bdbe8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/code_cov.yml b/.github/workflows/code_cov.yml
@@ -6,7 +6,7 @@ env:
   REPO_NAME: 'dafoam'
   DOCKER_WORKING_DIR: '/home/dafoamuser/dafoam/$REPO_NAME'
   DOCKER_MOUNT_DIR: '/home/dafoamuser/mount/$REPO_NAME'
-  DOCKER_TAG: 'v4'
+  DOCKER_TAG: 'latest'
   DOCKER_ENV_FILE: '/home/dafoamuser/dafoam/loadDAFoam.sh'
   DOCKER_OF_ADF_BASHRC: '/home/dafoamuser/dafoam/OpenFOAM/OpenFOAM-v1812-ADF/etc/bashrc'
   DOCKER_OF_ADR_BASHRC: '/home/dafoamuser/dafoam/OpenFOAM/OpenFOAM-v1812-ADR/etc/bashrc'

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -3,7 +3,7 @@ name: docker
 on:
   push:
     branches:
-      - v4
+      - main
 
 env:
   DOCKER_ENV_FILE: '/home/dafoamuser/dafoam/loadDAFoam.sh'
@@ -17,11 +17,11 @@ jobs:
     - name: Build and push
       run: |
         echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u dafoam --password-stdin
-        docker pull dafoam/opt-packages:v4
-        docker run -i -d -u dafoamuser --name build_v4 dafoam/opt-packages:v4 /bin/bash
-        docker exec -e COMPILE_DAFOAM_ADF=1 -i build_v4 /bin/bash -c ". ${{env.DOCKER_ENV_FILE}} && cd /home/dafoamuser/dafoam/repos && rm -rf dafoam && git clone https://github.com/mdolab/dafoam && cd dafoam && git checkout v4 && ./Allmake"
-        docker export build_v4 > build_v4.tar
+        docker pull dafoam/opt-packages:latest
+        docker run -i -d -u dafoamuser --name build_latest dafoam/opt-packages:latest /bin/bash
+        docker exec -e COMPILE_DAFOAM_ADF=1 -i build_latest /bin/bash -c ". ${{env.DOCKER_ENV_FILE}} && cd /home/dafoamuser/dafoam/repos && rm -rf dafoam && git clone https://github.com/mdolab/dafoam && cd dafoam && git checkout latest && ./Allmake"
+        docker export build_latest > build_latest.tar
         docker rm -f $(docker ps -a -q)
-        docker rmi -f dafoam/opt-packages:v4
-        docker import build_v4.tar dafoam/opt-packages:v4
-        docker push dafoam/opt-packages:v4
+        docker rmi -f dafoam/opt-packages:latest
+        docker import build_latest.tar dafoam/opt-packages:latest
+        docker push dafoam/opt-packages:latest
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -6,7 +6,7 @@ env:
   REPO_NAME: 'dafoam'
   DOCKER_WORKING_DIR: '/home/dafoamuser/dafoam/$REPO_NAME'
   DOCKER_MOUNT_DIR: '/home/dafoamuser/mount/$REPO_NAME'
-  DOCKER_TAG: 'v4'
+  DOCKER_TAG: 'latest'
   DOCKER_ENV_FILE: '/home/dafoamuser/dafoam/loadDAFoam.sh'
   DOCKER_OF_ADF_BASHRC: '/home/dafoamuser/dafoam/OpenFOAM/OpenFOAM-v1812-ADF/etc/bashrc'
   DOCKER_OF_ADR_BASHRC: '/home/dafoamuser/dafoam/OpenFOAM/OpenFOAM-v1812-ADR/etc/bashrc'