Skip to content

Commit c2bdbe8

Browse files
authoredFeb 1, 2025··
Changed the yml file to use latest docker. (#754)
1 parent cdb0ca9 commit c2bdbe8

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed
 

‎.github/workflows/code_cov.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ env:
66
REPO_NAME: 'dafoam'
77
DOCKER_WORKING_DIR: '/home/dafoamuser/dafoam/$REPO_NAME'
88
DOCKER_MOUNT_DIR: '/home/dafoamuser/mount/$REPO_NAME'
9-
DOCKER_TAG: 'v4'
9+
DOCKER_TAG: 'latest'
1010
DOCKER_ENV_FILE: '/home/dafoamuser/dafoam/loadDAFoam.sh'
1111
DOCKER_OF_ADF_BASHRC: '/home/dafoamuser/dafoam/OpenFOAM/OpenFOAM-v1812-ADF/etc/bashrc'
1212
DOCKER_OF_ADR_BASHRC: '/home/dafoamuser/dafoam/OpenFOAM/OpenFOAM-v1812-ADR/etc/bashrc'

‎.github/workflows/docker.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: docker
33
on:
44
push:
55
branches:
6-
- v4
6+
- main
77

88
env:
99
DOCKER_ENV_FILE: '/home/dafoamuser/dafoam/loadDAFoam.sh'
@@ -17,11 +17,11 @@ jobs:
1717
- name: Build and push
1818
run: |
1919
echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u dafoam --password-stdin
20-
docker pull dafoam/opt-packages:v4
21-
docker run -i -d -u dafoamuser --name build_v4 dafoam/opt-packages:v4 /bin/bash
22-
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"
23-
docker export build_v4 > build_v4.tar
20+
docker pull dafoam/opt-packages:latest
21+
docker run -i -d -u dafoamuser --name build_latest dafoam/opt-packages:latest /bin/bash
22+
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"
23+
docker export build_latest > build_latest.tar
2424
docker rm -f $(docker ps -a -q)
25-
docker rmi -f dafoam/opt-packages:v4
26-
docker import build_v4.tar dafoam/opt-packages:v4
27-
docker push dafoam/opt-packages:v4
25+
docker rmi -f dafoam/opt-packages:latest
26+
docker import build_latest.tar dafoam/opt-packages:latest
27+
docker push dafoam/opt-packages:latest

‎.github/workflows/tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ env:
66
REPO_NAME: 'dafoam'
77
DOCKER_WORKING_DIR: '/home/dafoamuser/dafoam/$REPO_NAME'
88
DOCKER_MOUNT_DIR: '/home/dafoamuser/mount/$REPO_NAME'
9-
DOCKER_TAG: 'v4'
9+
DOCKER_TAG: 'latest'
1010
DOCKER_ENV_FILE: '/home/dafoamuser/dafoam/loadDAFoam.sh'
1111
DOCKER_OF_ADF_BASHRC: '/home/dafoamuser/dafoam/OpenFOAM/OpenFOAM-v1812-ADF/etc/bashrc'
1212
DOCKER_OF_ADR_BASHRC: '/home/dafoamuser/dafoam/OpenFOAM/OpenFOAM-v1812-ADR/etc/bashrc'

0 commit comments

Comments
 (0)
Please sign in to comment.