From cb69f9e8d643774ea1c562a5752efcc2a4d2c1e1 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Tue, 12 Nov 2024 20:55:54 +0100 Subject: [PATCH 01/29] debug CI --- .github/workflows/docker.yml | 20 +++++++++++--------- README.md | 3 ++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2a4f5c18..6859e7d2 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -34,24 +34,26 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 + - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - with: - platforms: 'arm64' + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/setup-buildx-action@v3 + + - name: Login to Docker Hub + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: - context: docker - push: true platforms: linux/amd64,linux/arm64 + push: true tags: cbonamy/${{ env.IMAGE_NAME }}:latest + //context: docker docker_nb: runs-on: ubuntu-latest diff --git a/README.md b/README.md index 1aa55563..6f787445 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,9 @@ sedfoam ======= [![Release](https://img.shields.io/badge/release-2406-blue.svg)](http://github.com/SedFoam/sedfoam) -[![sedFoam](https://circleci.com/gh/SedFoam/sedfoam.svg?style=shield)](https://circleci.com/gh/SedFoam/sedfoam) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/b9ad60ec6171496290c336697426cd48)](https://www.codacy.com/gh/SedFoam/sedfoam/dashboard?utm_source=github.com&utm_medium=referral&utm_content=SedFoam/sedfoam&utm_campaign=Badge_Grade) +[![OpenFOAM v24xx](https://img.shields.io/badge/OpenFOAM-v24xx-brightgreen.svg)](https://openfoam.com/) +[![OpenFOAM v23xx](https://img.shields.io/badge/OpenFOAM-v23xx-brightgreen.svg)](https://openfoam.com/) [![OpenFOAM v22xx](https://img.shields.io/badge/OpenFOAM-v22xx-brightgreen.svg)](https://openfoam.com/) [![OpenFOAM v21xx](https://img.shields.io/badge/OpenFOAM-v21xx-brightgreen.svg)](https://openfoam.com/) [![OpenFOAM v20xx](https://img.shields.io/badge/OpenFOAM-v20xx-brightgreen.svg)](https://openfoam.com/) From 3598ac0a699e0dadded01b612fc5d7eaac81232e Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Tue, 12 Nov 2024 21:10:38 +0100 Subject: [PATCH 02/29] debug CI --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6859e7d2..6bd2a626 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -53,7 +53,7 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: cbonamy/${{ env.IMAGE_NAME }}:latest - //context: docker + context: docker docker_nb: runs-on: ubuntu-latest From fe2ca89b1ea64f6fe7f9a333887f221aaf5a1fe0 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Tue, 12 Nov 2024 22:21:14 +0100 Subject: [PATCH 03/29] split docker build to avoid 6h timeout limit --- .github/workflows/docker.yml | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6bd2a626..bb21649d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -50,7 +50,36 @@ jobs: - name: Build and push uses: docker/build-push-action@v6 with: - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 + push: true + tags: cbonamy/${{ env.IMAGE_NAME }}:latest + context: docker + + docker_arm: + runs-on: ubuntu-latest + env: + IMAGE_NAME: sedfoam_2406_ubuntu + needs: build + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push + uses: docker/build-push-action@v6 + with: + platforms: linux/arm64 push: true tags: cbonamy/${{ env.IMAGE_NAME }}:latest context: docker From 165a1dcdd91f25b9640e152a6e7a96a5f5457d2c Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Tue, 12 Nov 2024 23:29:03 +0100 Subject: [PATCH 04/29] debug docker nb --- .github/workflows/docker.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index bb21649d..0672fccf 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -93,21 +93,19 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - with: - platforms: 'arm64,arm' + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: context: docker file: docker/Dockerfile_nb push: true - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 #,linux/arm64 tags: cbonamy/${{ env.IMAGE_NAME }}:latest From 34417270fa4e47ce15fac2188cd98008048664a2 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Wed, 13 Nov 2024 00:32:05 +0100 Subject: [PATCH 05/29] debug docker nb --- docker/Dockerfile_nb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile_nb b/docker/Dockerfile_nb index 911f72aa..bfe9b748 100644 --- a/docker/Dockerfile_nb +++ b/docker/Dockerfile_nb @@ -25,7 +25,7 @@ RUN update-ca-certificates && apt-get update \ libxext-dev \ libxrender1 \ lmodern \ - netcat \ + # netcat \ python3-dev \ python3-netcdf4 \ python3-pandas \ From cc19b3d8638376148898b2c709265a50590b91c9 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Wed, 13 Nov 2024 08:16:38 +0100 Subject: [PATCH 06/29] test debug timeout 6h for CI --- docker/Dockerfile | 9 +++++---- docker/Dockerfile_nb | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index b445f229..f0133b84 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,9 +5,10 @@ ARG DEBIAN_FRONTEND=noninteractive RUN update-ca-certificates && apt-get update \ && apt-get install --no-install-recommends -y \ - python3-pip python3-dev python3-venv python-is-python3 ipython3 \ - unzip git mercurial meld libreadline-dev vim nano emacs python3-pandas \ - texlive dvipng python3-tk cm-super texlive-latex-extra python3-netcdf4 python3-venv \ + python3-pip python3-dev python-is-python3 ipython3 \ + unzip git mercurial libreadline-dev vim nano emacs python3-venv \ + #python3-tk cm-super meld \ + #texlive dvipng texlive-latex-extra python3-netcdf4 python3-pandas \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* RUN python3 -m venv /home/sudofoam/pyenv @@ -24,7 +25,7 @@ WORKDIR /root/swak4Foam RUN /bin/bash -c 'shopt -s expand_aliases && ./maintainanceScripts/compileRequirements.sh' WORKDIR /root/swak4Foam -RUN /bin/bash -c 'shopt -s expand_aliases && source /openfoam/bash.rc && export FOAM_USER_LIBBIN=$FOAM_SITE_LIBBIN && export FOAM_USER_APPBIN=$FOAM_SITE_APPBIN && export WM_NCOMPPROCS=1 && ./Allwmake' +RUN /bin/bash -c 'shopt -s expand_aliases && source /openfoam/bash.rc && export FOAM_USER_LIBBIN=$FOAM_SITE_LIBBIN && export FOAM_USER_APPBIN=$FOAM_SITE_APPBIN && export WM_NCOMPPROCS=4 && ./Allwmake' WORKDIR /root/sedfoam RUN /bin/bash -c 'shopt -s expand_aliases && source /openfoam/bash.rc && export FOAM_USER_LIBBIN=$FOAM_SITE_LIBBIN && ./Allwmake -prefix=group' diff --git a/docker/Dockerfile_nb b/docker/Dockerfile_nb index bfe9b748..305cbecc 100644 --- a/docker/Dockerfile_nb +++ b/docker/Dockerfile_nb @@ -126,8 +126,8 @@ RUN set -x && \ # Pin major.minor version of python # mamba list python | grep '^python ' | tr -s ' ' | cut -d ' ' -f 1,2 >> "${CONDA_DIR}/conda-meta/pinned" && \ mamba clean --all -f -y && \ - fix-permissions "${CONDA_DIR}" && \ - fix-permissions "/home/${NB_USER}" + #fix-permissions "${CONDA_DIR}" && \ + #fix-permissions "/home/${NB_USER}" RUN mamba install -c conda-forge --quiet --yes \ 'pandas' \ From afbd4e5705bacbc687653d72532ecf12aea34bc0 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Wed, 13 Nov 2024 09:25:59 +0100 Subject: [PATCH 07/29] debug test --- docker/Dockerfile_nb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile_nb b/docker/Dockerfile_nb index 305cbecc..14211415 100644 --- a/docker/Dockerfile_nb +++ b/docker/Dockerfile_nb @@ -125,7 +125,7 @@ RUN set -x && \ rm micromamba && \ # Pin major.minor version of python # mamba list python | grep '^python ' | tr -s ' ' | cut -d ' ' -f 1,2 >> "${CONDA_DIR}/conda-meta/pinned" && \ - mamba clean --all -f -y && \ + mamba clean --all -f -y #fix-permissions "${CONDA_DIR}" && \ #fix-permissions "/home/${NB_USER}" From 63fa02f655db7a50944c13a2ca2133339c8fae11 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Wed, 13 Nov 2024 10:09:39 +0100 Subject: [PATCH 08/29] test debug timeout 6h for CI 2 --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f0133b84..496c2ee8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -25,7 +25,7 @@ WORKDIR /root/swak4Foam RUN /bin/bash -c 'shopt -s expand_aliases && ./maintainanceScripts/compileRequirements.sh' WORKDIR /root/swak4Foam -RUN /bin/bash -c 'shopt -s expand_aliases && source /openfoam/bash.rc && export FOAM_USER_LIBBIN=$FOAM_SITE_LIBBIN && export FOAM_USER_APPBIN=$FOAM_SITE_APPBIN && export WM_NCOMPPROCS=4 && ./Allwmake' +RUN /bin/bash -c 'shopt -s expand_aliases && source /openfoam/bash.rc && export FOAM_USER_LIBBIN=$FOAM_SITE_LIBBIN && export FOAM_USER_APPBIN=$FOAM_SITE_APPBIN && export SWAK_COMPILE_GRAMMAR_OPTION=-1 && export WM_NCOMPPROCS=1 && ./Allwmake' WORKDIR /root/sedfoam RUN /bin/bash -c 'shopt -s expand_aliases && source /openfoam/bash.rc && export FOAM_USER_LIBBIN=$FOAM_SITE_LIBBIN && ./Allwmake -prefix=group' From 00abf9b1d28ffa7b4790217c7c7187e617139f23 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Wed, 13 Nov 2024 10:45:09 +0100 Subject: [PATCH 09/29] test debug timeout 6h for CI 3 --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 496c2ee8..ff541ec9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -25,7 +25,7 @@ WORKDIR /root/swak4Foam RUN /bin/bash -c 'shopt -s expand_aliases && ./maintainanceScripts/compileRequirements.sh' WORKDIR /root/swak4Foam -RUN /bin/bash -c 'shopt -s expand_aliases && source /openfoam/bash.rc && export FOAM_USER_LIBBIN=$FOAM_SITE_LIBBIN && export FOAM_USER_APPBIN=$FOAM_SITE_APPBIN && export SWAK_COMPILE_GRAMMAR_OPTION=-1 && export WM_NCOMPPROCS=1 && ./Allwmake' +RUN /bin/bash -c 'shopt -s expand_aliases && source /openfoam/bash.rc && export FOAM_USER_LIBBIN=$FOAM_SITE_LIBBIN && export FOAM_USER_APPBIN=$FOAM_SITE_APPBIN && export SWAK_COMPILE_GRAMMAR_OPTION=-O1 && export WM_NCOMPPROCS=1 && ./Allwmake' WORKDIR /root/sedfoam RUN /bin/bash -c 'shopt -s expand_aliases && source /openfoam/bash.rc && export FOAM_USER_LIBBIN=$FOAM_SITE_LIBBIN && ./Allwmake -prefix=group' From 21d1cd8da3a325b0cf987b0d5430767be7b941f4 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Wed, 13 Nov 2024 15:18:43 +0100 Subject: [PATCH 10/29] try macos-latest docker to speed up arm docker build --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 0672fccf..4f956cb8 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -56,10 +56,10 @@ jobs: context: docker docker_arm: - runs-on: ubuntu-latest + runs-on: macos-latest env: IMAGE_NAME: sedfoam_2406_ubuntu - needs: build + #needs: build steps: - name: Checkout repository uses: actions/checkout@v3 From 4aef30cf03f5c394f56023c738eb6bf3e4b05ae4 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Wed, 13 Nov 2024 15:21:04 +0100 Subject: [PATCH 11/29] try macos-latest docker --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4f956cb8..231adfd0 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -64,8 +64,8 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + #- name: Set up QEMU + # uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From 4d661b4c3b1dd45ff844e3d174c6a713f3f2f777 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Wed, 13 Nov 2024 16:14:13 +0100 Subject: [PATCH 12/29] add docker builds ARM --- .github/workflows/docker.yml | 12 ++++---- .github/workflows/docker_arm.yml | 47 ++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/docker_arm.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 231adfd0..6b44ebd9 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -56,16 +56,16 @@ jobs: context: docker docker_arm: - runs-on: macos-latest + runs-on: ubuntu-latest env: IMAGE_NAME: sedfoam_2406_ubuntu - #needs: build + needs: build steps: - name: Checkout repository uses: actions/checkout@v3 - #- name: Set up QEMU - # uses: docker/setup-qemu-action@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -79,7 +79,7 @@ jobs: - name: Build and push uses: docker/build-push-action@v6 with: - platforms: linux/arm64 + platforms: linux/arm64/v8 push: true tags: cbonamy/${{ env.IMAGE_NAME }}:latest context: docker @@ -107,5 +107,5 @@ jobs: context: docker file: docker/Dockerfile_nb push: true - platforms: linux/amd64 #,linux/arm64 + platforms: linux/amd64 #,linux/arm64/v8 tags: cbonamy/${{ env.IMAGE_NAME }}:latest diff --git a/.github/workflows/docker_arm.yml b/.github/workflows/docker_arm.yml new file mode 100644 index 00000000..6a59115b --- /dev/null +++ b/.github/workflows/docker_arm.yml @@ -0,0 +1,47 @@ +name: generate_docker +on: + push: + branches: ['develop'] +# Warning : schedule is only for default branch +# schedule: +# - cron: '0 3 * * 1' +defaults: + run: + shell: bash +jobs: + + docker_arm: + runs-on: macos-latest + env: + IMAGE_NAME: sedfoam_2406_ubuntu + #needs: build + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Set up Docker + uses: douglascamata/setup-docker-macos-action@v1-alpha + + - name: Install buildx + run: | + mkdir -p "${HOME}/.docker/cli-plugins" + curl -fL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.darwin-amd64 -o "${HOME}/.docker/cli-plugins/docker-buildx" + chmod +x "${HOME}/.docker/cli-plugins/docker-buildx" + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push + uses: docker/build-push-action@v6 + with: + platforms: linux/arm64/v8 + push: true + tags: cbonamy/${{ env.IMAGE_NAME }}:latest + context: docker + From f620b616b451e33ed144ffdd6dd91c191cc14bc2 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Wed, 13 Nov 2024 16:18:11 +0100 Subject: [PATCH 13/29] add docker arm --- .github/workflows/docker_arm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker_arm.yml b/.github/workflows/docker_arm.yml index 6a59115b..2b9311bb 100644 --- a/.github/workflows/docker_arm.yml +++ b/.github/workflows/docker_arm.yml @@ -11,7 +11,7 @@ defaults: jobs: docker_arm: - runs-on: macos-latest + runs-on: macos-13 env: IMAGE_NAME: sedfoam_2406_ubuntu #needs: build From e61b8799742e87850ae0011d6411ac0fcf2afdcf Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Wed, 13 Nov 2024 16:38:35 +0100 Subject: [PATCH 14/29] try split docker build --- .github/workflows/docker.yml | 32 ----------- .github/workflows/docker_arm.yml | 93 ++++++++++++++++++++++++++------ docker/Dockerfile_comp | 21 ++++++++ docker/Dockerfile_fordev | 32 +++++++++++ 4 files changed, 131 insertions(+), 47 deletions(-) create mode 100644 docker/Dockerfile_comp create mode 100644 docker/Dockerfile_fordev diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6b44ebd9..84928d97 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,9 +2,6 @@ name: generate_docker on: push: branches: ['develop'] -# Warning : schedule is only for default branch -# schedule: -# - cron: '0 3 * * 1' defaults: run: shell: bash @@ -55,35 +52,6 @@ jobs: tags: cbonamy/${{ env.IMAGE_NAME }}:latest context: docker - docker_arm: - runs-on: ubuntu-latest - env: - IMAGE_NAME: sedfoam_2406_ubuntu - needs: build - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v6 - with: - platforms: linux/arm64/v8 - push: true - tags: cbonamy/${{ env.IMAGE_NAME }}:latest - context: docker - docker_nb: runs-on: ubuntu-latest env: diff --git a/.github/workflows/docker_arm.yml b/.github/workflows/docker_arm.yml index 2b9311bb..c3b3a4ce 100644 --- a/.github/workflows/docker_arm.yml +++ b/.github/workflows/docker_arm.yml @@ -1,32 +1,69 @@ -name: generate_docker +name: generate_docker_arm on: push: branches: ['develop'] -# Warning : schedule is only for default branch -# schedule: -# - cron: '0 3 * * 1' defaults: run: shell: bash jobs: - docker_arm: - runs-on: macos-13 + build: + runs-on: ubuntu-latest + container: opencfd/openfoam-dev:2406 + steps: + - name: install git + run: | + apt-get update && apt-get install -y git + - name: Check out repository code + uses: actions/checkout@v3 + with: + submodules: recursive + - name: Build sedfoam + run: | + shopt -s expand_aliases && source /openfoam/bash.rc && + export FOAM_USER_LIBBIN=$FOAM_SITE_LIBBIN && ./Allwmake -prefix=group + + docker: + runs-on: ubuntu-latest env: - IMAGE_NAME: sedfoam_2406_ubuntu - #needs: build + IMAGE_NAME: openfoam_2406_ubuntu + needs: build steps: - name: Checkout repository uses: actions/checkout@v3 - - name: Set up Docker - uses: douglascamata/setup-docker-macos-action@v1-alpha + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push + uses: docker/build-push-action@v6 + with: + file: docker/Dockerfile_fordev + platforms: linux/arm64/v8 + push: true + tags: cbonamy/${{ env.IMAGE_NAME }}:latest + context: docker + + docker-2: + runs-on: ubuntu-latest + env: + IMAGE_NAME: sedfoam_2406_ubuntu + needs: docker + steps: + - name: Checkout repository + uses: actions/checkout@v3 - - name: Install buildx - run: | - mkdir -p "${HOME}/.docker/cli-plugins" - curl -fL https://github.com/docker/buildx/releases/download/v0.16.2/buildx-v0.16.2.darwin-amd64 -o "${HOME}/.docker/cli-plugins/docker-buildx" - chmod +x "${HOME}/.docker/cli-plugins/docker-buildx" + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -40,8 +77,34 @@ jobs: - name: Build and push uses: docker/build-push-action@v6 with: + file: docker/Dockerfile_comp platforms: linux/arm64/v8 push: true tags: cbonamy/${{ env.IMAGE_NAME }}:latest context: docker + docker_nb: + runs-on: ubuntu-latest + env: + IMAGE_NAME: sedfoam_2406_notebook + needs: docker-2 + steps: + - name: Checkout repository + uses: actions/checkout@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Login to DockerHub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v6 + with: + context: docker + file: docker/Dockerfile_nb + push: true + platforms: linux/arm64/v8 + tags: cbonamy/${{ env.IMAGE_NAME }}:latest diff --git a/docker/Dockerfile_comp b/docker/Dockerfile_comp new file mode 100644 index 00000000..8eddd6df --- /dev/null +++ b/docker/Dockerfile_comp @@ -0,0 +1,21 @@ +FROM cbonamy/openfoam_2406_ubuntu +LABEL maintainer="cyrille.bonamy@univ-grenoble-alpes.fr" +ARG WM_NCOMPPROCS=10 +ARG DEBIAN_FRONTEND=noninteractive + +USER root + +WORKDIR /root/swak4Foam +RUN /bin/bash -c 'shopt -s expand_aliases && source /openfoam/bash.rc && export FOAM_USER_LIBBIN=$FOAM_SITE_LIBBIN && export FOAM_USER_APPBIN=$FOAM_SITE_APPBIN && export SWAK_COMPILE_GRAMMAR_OPTION=-O1 && export WM_NCOMPPROCS=1 && ./Allwmake' + +WORKDIR /root/sedfoam +RUN /bin/bash -c 'shopt -s expand_aliases && source /openfoam/bash.rc && export FOAM_USER_LIBBIN=$FOAM_SITE_LIBBIN && ./Allwmake -prefix=group' + +USER 1001 + +WORKDIR /home/sudofoam +RUN sudo cp -r /root/sedfoam sedfoam && sudo chown -R sudofoam: /home/sudofoam && sudo rm -rf /root/* + +WORKDIR /home/sudofoam +ENV HOME=/home/sudofoam +ENTRYPOINT ["/bin/bash", "-c"] diff --git a/docker/Dockerfile_fordev b/docker/Dockerfile_fordev new file mode 100644 index 00000000..f752a7fe --- /dev/null +++ b/docker/Dockerfile_fordev @@ -0,0 +1,32 @@ +FROM opencfd/openfoam-default:2406 +LABEL maintainer="cyrille.bonamy@univ-grenoble-alpes.fr" +ARG WM_NCOMPPROCS=10 +ARG DEBIAN_FRONTEND=noninteractive + +RUN update-ca-certificates && apt-get update \ + && apt-get install --no-install-recommends -y \ + python3-pip python3-dev python-is-python3 ipython3 \ + unzip git mercurial libreadline-dev vim nano emacs python3-venv \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* +RUN python3 -m venv /home/sudofoam/pyenv + +RUN /bin/bash -c 'shopt -s expand_aliases && source /home/sudofoam/pyenv/bin/activate && pip3 install --no-cache-dir fluidfoam pandas matplotlib odfpy black' + +WORKDIR /root/ +RUN git clone --branch develop --recurse-submodules https://github.com/sedfoam/sedfoam.git --depth 1 + +WORKDIR /root +RUN /bin/bash -c 'hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam -b develop && cp sedfoam/docker/Allwmakeswak swak4Foam/Libraries/Allwmake' + +WORKDIR /root/swak4Foam +RUN /bin/bash -c 'shopt -s expand_aliases && ./maintainanceScripts/compileRequirements.sh' + +USER 1001 + +WORKDIR /home/sudofoam +RUN echo "source /home/sudofoam/pyenv/bin/activate" >> .bashrc + +WORKDIR /home/sudofoam +ENV HOME=/home/sudofoam +ENTRYPOINT ["/bin/bash", "-c"] From 71408903afb15695519fff86fe5e1456d12e61f0 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Thu, 14 Nov 2024 00:40:07 +0100 Subject: [PATCH 15/29] update docker --- docker/Dockerfile | 4 ++-- docker/Dockerfile_fordev | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index ff541ec9..d2596057 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,9 +5,9 @@ ARG DEBIAN_FRONTEND=noninteractive RUN update-ca-certificates && apt-get update \ && apt-get install --no-install-recommends -y \ - python3-pip python3-dev python-is-python3 ipython3 \ + python3-pip python3-dev python-is-python3 ipython3 python3-tk \ unzip git mercurial libreadline-dev vim nano emacs python3-venv \ - #python3-tk cm-super meld \ + #cm-super meld \ #texlive dvipng texlive-latex-extra python3-netcdf4 python3-pandas \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/Dockerfile_fordev b/docker/Dockerfile_fordev index f752a7fe..449743a7 100644 --- a/docker/Dockerfile_fordev +++ b/docker/Dockerfile_fordev @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive RUN update-ca-certificates && apt-get update \ && apt-get install --no-install-recommends -y \ - python3-pip python3-dev python-is-python3 ipython3 \ + python3-pip python3-dev python-is-python3 ipython3 python3-tk \ unzip git mercurial libreadline-dev vim nano emacs python3-venv \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* From 410eb33e22521d30c3b5bb094396829fd0d01bd6 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Thu, 14 Nov 2024 09:06:53 +0100 Subject: [PATCH 16/29] update docker_nb to avoid warning --- .github/workflows/docker.yml | 2 +- .github/workflows/docker_arm.yml | 2 +- docker/Dockerfile_nb | 11 +---------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 84928d97..79765960 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -56,7 +56,7 @@ jobs: runs-on: ubuntu-latest env: IMAGE_NAME: sedfoam_2406_notebook - needs: docker +# needs: docker steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/.github/workflows/docker_arm.yml b/.github/workflows/docker_arm.yml index c3b3a4ce..63f70bff 100644 --- a/.github/workflows/docker_arm.yml +++ b/.github/workflows/docker_arm.yml @@ -87,7 +87,7 @@ jobs: runs-on: ubuntu-latest env: IMAGE_NAME: sedfoam_2406_notebook - needs: docker-2 +# needs: docker-2 steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/docker/Dockerfile_nb b/docker/Dockerfile_nb index 14211415..6612c5de 100644 --- a/docker/Dockerfile_nb +++ b/docker/Dockerfile_nb @@ -25,7 +25,6 @@ RUN update-ca-certificates && apt-get update \ libxext-dev \ libxrender1 \ lmodern \ - # netcat \ python3-dev \ python3-netcdf4 \ python3-pandas \ @@ -83,10 +82,6 @@ USER 1001 ARG PYTHON_VERSION=default -# Setup work directory for backward-compatibility -# RUN mkdir "/home/${NB_USER}/work" && \ -# fix-permissions "/home/${NB_USER}" - # Download and install Micromamba, and initialize Conda prefix. # # Similar projects using Micromamba: @@ -126,8 +121,6 @@ RUN set -x && \ # Pin major.minor version of python # mamba list python | grep '^python ' | tr -s ' ' | cut -d ' ' -f 1,2 >> "${CONDA_DIR}/conda-meta/pinned" && \ mamba clean --all -f -y - #fix-permissions "${CONDA_DIR}" && \ - #fix-permissions "/home/${NB_USER}" RUN mamba install -c conda-forge --quiet --yes \ 'pandas' \ @@ -135,15 +128,13 @@ RUN mamba install -c conda-forge --quiet --yes \ 'notebook' \ 'nbclassic' \ 'netCDF4' \ -# 'jupyterhub' \ 'jupyterlab' && \ + mamba update jupyter_client && \ jupyter notebook --generate-config && \ mamba clean --all -f -y && \ npm cache clean --force && \ jupyter lab clean && \ rm -rf "/home/${NB_USER}/.cache/yarn" && \ -# fix-permissions "${CONDA_DIR}" && \ -# fix-permissions "/home/${NB_USER}" && \ pip3 install fluidfoam odfpy ENV JUPYTER_PORT=8888 From 2634aa444e7b56fc22e524ccc76951175664e373 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Thu, 14 Nov 2024 22:08:35 +0100 Subject: [PATCH 17/29] docker build... --- .../workflows/{docker.yml => docker.yml.old} | 0 .github/workflows/docker_all.yml | 432 ++++++++++++++++++ .../{docker_arm.yml => docker_arm.yml.old} | 0 3 files changed, 432 insertions(+) rename .github/workflows/{docker.yml => docker.yml.old} (100%) create mode 100644 .github/workflows/docker_all.yml rename .github/workflows/{docker_arm.yml => docker_arm.yml.old} (100%) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml.old similarity index 100% rename from .github/workflows/docker.yml rename to .github/workflows/docker.yml.old diff --git a/.github/workflows/docker_all.yml b/.github/workflows/docker_all.yml new file mode 100644 index 00000000..2a6e96d1 --- /dev/null +++ b/.github/workflows/docker_all.yml @@ -0,0 +1,432 @@ +name: generate_docker_multiarch +on: + push: + branches: ['develop'] +defaults: + run: + shell: bash +jobs: + + build: + runs-on: ubuntu-latest + container: opencfd/openfoam-dev:2406 + steps: + - name: install git + run: | + apt-get update && apt-get install -y git + - name: Check out repository code + uses: actions/checkout@v3 + with: + submodules: recursive + - name: Build sedfoam + run: | + shopt -s expand_aliases && source /openfoam/bash.rc && + export FOAM_USER_LIBBIN=$FOAM_SITE_LIBBIN && ./Allwmake -prefix=group + + docker: + runs-on: ubuntu-latest + env: + IMAGE_NAME: openfoam_2406_ubuntu + REGISTRY_NAME: openfoam_2406_ubuntu + #needs: build + strategy: + fail-fast: false + matrix: + platform: + - linux/amd64 + - linux/arm64 + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Prepare + run: | + platform=${{ matrix.platform }} + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY_IMAGE }} + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push by digest + id: build + uses: docker/build-push-action@v6 + with: + platforms: ${{ matrix.platform }} + labels: ${{ steps.meta.outputs.labels }} + outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true + context: docker + file: docker/Dockerfile_fordev + +# - name: Build and push +# uses: docker/build-push-action@v6 +# with: +# platforms: linux/amd64 +# push: true +# tags: cbonamy/${{ env.IMAGE_NAME }}:latest +# context: docker + + - name: Export digest + run: | + mkdir -p /tmp/digests + digest="${{ steps.build.outputs.digest }}" + touch "/tmp/digests/${digest#sha256:}" + + - name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: digests-${{ env.PLATFORM_PAIR }} + path: /tmp/digests/* + if-no-files-found: error + retention-days: 1 + + merge: + runs-on: ubuntu-latest + needs: + - docker + steps: + - name: Download digests + uses: actions/download-artifact@v4 + with: + path: /tmp/digests + pattern: digests-* + merge-multiple: true + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY_IMAGE }} + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Create manifest list and push + working-directory: /tmp/digests + run: | + docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) + + - name: Inspect image + run: | + docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} + + docker-2: + runs-on: ubuntu-latest + env: + IMAGE_NAME: sedfoam_2406_ubuntu + REGISTRY_NAME: sedfoam_2406_ubuntu + needs: merge + strategy: + fail-fast: false + matrix: + platform: + - linux/amd64 + - linux/arm64 + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Prepare + run: | + platform=${{ matrix.platform }} + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY_IMAGE }} + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push by digest + id: build + uses: docker/build-push-action@v6 + with: + platforms: ${{ matrix.platform }} + labels: ${{ steps.meta.outputs.labels }} + outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true + context: docker + file: docker/Dockerfile_comp + + - name: Export digest + run: | + mkdir -p /tmp/digests + digest="${{ steps.build.outputs.digest }}" + touch "/tmp/digests/${digest#sha256:}" + + - name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: digests-${{ env.PLATFORM_PAIR }} + path: /tmp/digests/* + if-no-files-found: error + retention-days: 1 + + merge-2: + runs-on: ubuntu-latest + needs: + - docker-2 + steps: + - name: Download digests + uses: actions/download-artifact@v4 + with: + path: /tmp/digests + pattern: digests-* + merge-multiple: true + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY_IMAGE }} + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Create manifest list and push + working-directory: /tmp/digests + run: | + docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) + + - name: Inspect image + run: | + docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} + + docker-2: + runs-on: ubuntu-latest + env: + IMAGE_NAME: sedfoam_2406_ubuntu + REGISTRY_NAME: sedfoam_2406_ubuntu + needs: merge + strategy: + fail-fast: false + matrix: + platform: + - linux/amd64 + - linux/arm64 + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Prepare + run: | + platform=${{ matrix.platform }} + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY_IMAGE }} + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push by digest + id: build + uses: docker/build-push-action@v6 + with: + platforms: ${{ matrix.platform }} + labels: ${{ steps.meta.outputs.labels }} + outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true + context: docker + file: docker/Dockerfile_comp + + - name: Export digest + run: | + mkdir -p /tmp/digests + digest="${{ steps.build.outputs.digest }}" + touch "/tmp/digests/${digest#sha256:}" + + - name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: digests-${{ env.PLATFORM_PAIR }} + path: /tmp/digests/* + if-no-files-found: error + retention-days: 1 + + merge-2: + runs-on: ubuntu-latest + needs: + - docker-2 + steps: + - name: Download digests + uses: actions/download-artifact@v4 + with: + path: /tmp/digests + pattern: digests-* + merge-multiple: true + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY_IMAGE }} + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Create manifest list and push + working-directory: /tmp/digests + run: | + docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) + + - name: Inspect image + run: | + docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} + + docker-nb: + runs-on: ubuntu-latest + env: + IMAGE_NAME: sedfoam_2406_notebook + REGISTRY_NAME: sedfoam_2406_notebook + needs: merge-2 + strategy: + fail-fast: false + matrix: + platform: + - linux/amd64 + - linux/arm64 + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Prepare + run: | + platform=${{ matrix.platform }} + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY_IMAGE }} + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push by digest + id: build + uses: docker/build-push-action@v6 + with: + platforms: ${{ matrix.platform }} + labels: ${{ steps.meta.outputs.labels }} + outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true + context: docker + file: docker/Dockerfile_nb + + - name: Export digest + run: | + mkdir -p /tmp/digests + digest="${{ steps.build.outputs.digest }}" + touch "/tmp/digests/${digest#sha256:}" + + - name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: digests-${{ env.PLATFORM_PAIR }} + path: /tmp/digests/* + if-no-files-found: error + retention-days: 1 + + merge-nb: + runs-on: ubuntu-latest + needs: + - docker-nb + steps: + - name: Download digests + uses: actions/download-artifact@v4 + with: + path: /tmp/digests + pattern: digests-* + merge-multiple: true + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY_IMAGE }} + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Create manifest list and push + working-directory: /tmp/digests + run: | + docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) + + - name: Inspect image + run: | + docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} diff --git a/.github/workflows/docker_arm.yml b/.github/workflows/docker_arm.yml.old similarity index 100% rename from .github/workflows/docker_arm.yml rename to .github/workflows/docker_arm.yml.old From f5b5f0cbd42c1d02bb9a6e8374789ab317cd1360 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Thu, 14 Nov 2024 22:10:54 +0100 Subject: [PATCH 18/29] rtest --- .github/workflows/{docker_all.yml => docker.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{docker_all.yml => docker.yml} (99%) diff --git a/.github/workflows/docker_all.yml b/.github/workflows/docker.yml similarity index 99% rename from .github/workflows/docker_all.yml rename to .github/workflows/docker.yml index 2a6e96d1..766379d2 100644 --- a/.github/workflows/docker_all.yml +++ b/.github/workflows/docker.yml @@ -1,4 +1,4 @@ -name: generate_docker_multiarch +name: generate_docker on: push: branches: ['develop'] From 1d71700eb6c038549e00a0708b4b941c77514374 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Thu, 14 Nov 2024 22:13:16 +0100 Subject: [PATCH 19/29] rtestsdsd --- .github/workflows/docker.yml | 100 ----------------------------------- 1 file changed, 100 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 766379d2..9c4f7d89 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -231,106 +231,6 @@ jobs: run: | docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} - docker-2: - runs-on: ubuntu-latest - env: - IMAGE_NAME: sedfoam_2406_ubuntu - REGISTRY_NAME: sedfoam_2406_ubuntu - needs: merge - strategy: - fail-fast: false - matrix: - platform: - - linux/amd64 - - linux/arm64 - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Prepare - run: | - platform=${{ matrix.platform }} - echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - images: ${{ env.REGISTRY_IMAGE }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push by digest - id: build - uses: docker/build-push-action@v6 - with: - platforms: ${{ matrix.platform }} - labels: ${{ steps.meta.outputs.labels }} - outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true - context: docker - file: docker/Dockerfile_comp - - - name: Export digest - run: | - mkdir -p /tmp/digests - digest="${{ steps.build.outputs.digest }}" - touch "/tmp/digests/${digest#sha256:}" - - - name: Upload digest - uses: actions/upload-artifact@v4 - with: - name: digests-${{ env.PLATFORM_PAIR }} - path: /tmp/digests/* - if-no-files-found: error - retention-days: 1 - - merge-2: - runs-on: ubuntu-latest - needs: - - docker-2 - steps: - - name: Download digests - uses: actions/download-artifact@v4 - with: - path: /tmp/digests - pattern: digests-* - merge-multiple: true - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - images: ${{ env.REGISTRY_IMAGE }} - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Create manifest list and push - working-directory: /tmp/digests - run: | - docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) - - - name: Inspect image - run: | - docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} - docker-nb: runs-on: ubuntu-latest env: From 69b10539ef543be8bd320b85c25e5c42287c4fdf Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Thu, 14 Nov 2024 22:17:18 +0100 Subject: [PATCH 20/29] rt --- .github/workflows/docker.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 9c4f7d89..7460ec49 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -71,6 +71,7 @@ jobs: outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true context: docker file: docker/Dockerfile_fordev + tags: cbonamy/${{ env.REGISTRY_NAME }}:latest # - name: Build and push # uses: docker/build-push-action@v6 @@ -179,6 +180,8 @@ jobs: outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true context: docker file: docker/Dockerfile_comp + tags: cbonamy/${{ env.REGISTRY_NAME }}:latest + - name: Export digest run: | @@ -279,6 +282,8 @@ jobs: outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true context: docker file: docker/Dockerfile_nb + tags: cbonamy/${{ env.REGISTRY_NAME }}:latest + - name: Export digest run: | From 2ef423b4c9f9a2971028e004e9b61419d1448c4b Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Thu, 14 Nov 2024 23:33:45 +0100 Subject: [PATCH 21/29] sss --- .github/workflows/docker.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7460ec49..6f138722 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -26,8 +26,7 @@ jobs: docker: runs-on: ubuntu-latest env: - IMAGE_NAME: openfoam_2406_ubuntu - REGISTRY_NAME: openfoam_2406_ubuntu + REGISTRY_NAME: cbonamy/openfoam_2406_ubuntu #needs: build strategy: fail-fast: false @@ -71,7 +70,7 @@ jobs: outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true context: docker file: docker/Dockerfile_fordev - tags: cbonamy/${{ env.REGISTRY_NAME }}:latest + #tags: ${{ env.REGISTRY_NAME }}:latest # - name: Build and push # uses: docker/build-push-action@v6 @@ -84,7 +83,7 @@ jobs: - name: Export digest run: | mkdir -p /tmp/digests - digest="${{ steps.build.outputs.digest }}" + digest="${{ steps.docker.outputs.digest }}" touch "/tmp/digests/${digest#sha256:}" - name: Upload digest @@ -135,8 +134,7 @@ jobs: docker-2: runs-on: ubuntu-latest env: - IMAGE_NAME: sedfoam_2406_ubuntu - REGISTRY_NAME: sedfoam_2406_ubuntu + REGISTRY_NAME: cbonamy/sedfoam_2406_ubuntu needs: merge strategy: fail-fast: false @@ -180,7 +178,7 @@ jobs: outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true context: docker file: docker/Dockerfile_comp - tags: cbonamy/${{ env.REGISTRY_NAME }}:latest + #tags: cbonamy/${{ env.REGISTRY_NAME }}:latest - name: Export digest @@ -237,8 +235,7 @@ jobs: docker-nb: runs-on: ubuntu-latest env: - IMAGE_NAME: sedfoam_2406_notebook - REGISTRY_NAME: sedfoam_2406_notebook + REGISTRY_NAME: cbonamy/sedfoam_2406_notebook needs: merge-2 strategy: fail-fast: false @@ -282,7 +279,7 @@ jobs: outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true context: docker file: docker/Dockerfile_nb - tags: cbonamy/${{ env.REGISTRY_NAME }}:latest + #tags: cbonamy/${{ env.REGISTRY_NAME }}:latest - name: Export digest From 1b436cb384fc82d1c97b671205dfb00029bad562 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Thu, 14 Nov 2024 23:39:58 +0100 Subject: [PATCH 22/29] ssq --- .github/workflows/docker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6f138722..55a25824 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -70,7 +70,7 @@ jobs: outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true context: docker file: docker/Dockerfile_fordev - #tags: ${{ env.REGISTRY_NAME }}:latest + tags: ${{ env.REGISTRY_NAME }}:latest # - name: Build and push # uses: docker/build-push-action@v6 @@ -178,7 +178,7 @@ jobs: outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true context: docker file: docker/Dockerfile_comp - #tags: cbonamy/${{ env.REGISTRY_NAME }}:latest + tags: ${{ env.REGISTRY_NAME }}:latest - name: Export digest @@ -279,7 +279,7 @@ jobs: outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true context: docker file: docker/Dockerfile_nb - #tags: cbonamy/${{ env.REGISTRY_NAME }}:latest + tags: ${{ env.REGISTRY_NAME }}:latest - name: Export digest From 43b66c2766034341cf0633f0efccea8d48b8cf62 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Fri, 15 Nov 2024 00:03:26 +0100 Subject: [PATCH 23/29] s --- .github/workflows/docker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 55a25824..d593c316 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -70,7 +70,7 @@ jobs: outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true context: docker file: docker/Dockerfile_fordev - tags: ${{ env.REGISTRY_NAME }}:latest + tags: ${{ env.REGISTRY_NAME }} # - name: Build and push # uses: docker/build-push-action@v6 @@ -178,7 +178,7 @@ jobs: outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true context: docker file: docker/Dockerfile_comp - tags: ${{ env.REGISTRY_NAME }}:latest + tags: ${{ env.REGISTRY_NAME }} - name: Export digest @@ -279,7 +279,7 @@ jobs: outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true context: docker file: docker/Dockerfile_nb - tags: ${{ env.REGISTRY_NAME }}:latest + tags: ${{ env.REGISTRY_NAME }} - name: Export digest From 143cc77b6ec7feae80dfc9007ef127419ff37d96 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Fri, 15 Nov 2024 00:15:37 +0100 Subject: [PATCH 24/29] aaa --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d593c316..405de467 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -83,7 +83,7 @@ jobs: - name: Export digest run: | mkdir -p /tmp/digests - digest="${{ steps.docker.outputs.digest }}" + digest="${{ steps.build.outputs.digest }}" touch "/tmp/digests/${digest#sha256:}" - name: Upload digest From 71c53a844cdee3dc8f36df43f900294e18018af3 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Fri, 15 Nov 2024 09:13:34 +0100 Subject: [PATCH 25/29] up test --- .github/workflows/docker.yml | 13 ++----------- docker/Dockerfile_fordev | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 405de467..30aa94ff 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest env: REGISTRY_NAME: cbonamy/openfoam_2406_ubuntu - #needs: build + needs: build strategy: fail-fast: false matrix: @@ -72,14 +72,6 @@ jobs: file: docker/Dockerfile_fordev tags: ${{ env.REGISTRY_NAME }} -# - name: Build and push -# uses: docker/build-push-action@v6 -# with: -# platforms: linux/amd64 -# push: true -# tags: cbonamy/${{ env.IMAGE_NAME }}:latest -# context: docker - - name: Export digest run: | mkdir -p /tmp/digests @@ -125,8 +117,7 @@ jobs: working-directory: /tmp/digests run: | docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) - + $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *) - name: Inspect image run: | docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} diff --git a/docker/Dockerfile_fordev b/docker/Dockerfile_fordev index 449743a7..c5fdd145 100644 --- a/docker/Dockerfile_fordev +++ b/docker/Dockerfile_fordev @@ -3,24 +3,24 @@ LABEL maintainer="cyrille.bonamy@univ-grenoble-alpes.fr" ARG WM_NCOMPPROCS=10 ARG DEBIAN_FRONTEND=noninteractive -RUN update-ca-certificates && apt-get update \ - && apt-get install --no-install-recommends -y \ - python3-pip python3-dev python-is-python3 ipython3 python3-tk \ - unzip git mercurial libreadline-dev vim nano emacs python3-venv \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* -RUN python3 -m venv /home/sudofoam/pyenv +#RUN update-ca-certificates && apt-get update \ +# && apt-get install --no-install-recommends -y \ +# python3-pip python3-dev python-is-python3 ipython3 python3-tk \ +# unzip git mercurial libreadline-dev vim nano emacs python3-venv \ +# && apt-get clean \ +# && rm -rf /var/lib/apt/lists/* +#RUN python3 -m venv /home/sudofoam/pyenv -RUN /bin/bash -c 'shopt -s expand_aliases && source /home/sudofoam/pyenv/bin/activate && pip3 install --no-cache-dir fluidfoam pandas matplotlib odfpy black' +#RUN /bin/bash -c 'shopt -s expand_aliases && source /home/sudofoam/pyenv/bin/activate && pip3 install --no-cache-dir fluidfoam pandas matplotlib odfpy black' -WORKDIR /root/ -RUN git clone --branch develop --recurse-submodules https://github.com/sedfoam/sedfoam.git --depth 1 +#WORKDIR /root/ +#RUN git clone --branch develop --recurse-submodules https://github.com/sedfoam/sedfoam.git --depth 1 -WORKDIR /root -RUN /bin/bash -c 'hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam -b develop && cp sedfoam/docker/Allwmakeswak swak4Foam/Libraries/Allwmake' +#WORKDIR /root +#RUN /bin/bash -c 'hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam -b develop && cp sedfoam/docker/Allwmakeswak swak4Foam/Libraries/Allwmake' -WORKDIR /root/swak4Foam -RUN /bin/bash -c 'shopt -s expand_aliases && ./maintainanceScripts/compileRequirements.sh' +#WORKDIR /root/swak4Foam +#RUN /bin/bash -c 'shopt -s expand_aliases && ./maintainanceScripts/compileRequirements.sh' USER 1001 From ae211ad883c4d8e0eb4778795fec471ba5720aee Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Fri, 15 Nov 2024 09:14:35 +0100 Subject: [PATCH 26/29] up te --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 30aa94ff..402075b6 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest env: REGISTRY_NAME: cbonamy/openfoam_2406_ubuntu - needs: build + #needs: build strategy: fail-fast: false matrix: From d13347e0eab10b7487205275b880f76cbac3fdcf Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Fri, 15 Nov 2024 09:23:00 +0100 Subject: [PATCH 27/29] up --- .github/workflows/docker.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 402075b6..994884fd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -26,7 +26,7 @@ jobs: docker: runs-on: ubuntu-latest env: - REGISTRY_NAME: cbonamy/openfoam_2406_ubuntu + REGISTRY_IMAGE: cbonamy/openfoam_2406_ubuntu #needs: build strategy: fail-fast: false @@ -70,7 +70,7 @@ jobs: outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true context: docker file: docker/Dockerfile_fordev - tags: ${{ env.REGISTRY_NAME }} + #tags: ${{ env.REGISTRY_IMAGE }} - name: Export digest run: | @@ -88,6 +88,8 @@ jobs: merge: runs-on: ubuntu-latest + env: + REGISTRY_IMAGE: cbonamy/openfoam_2406_ubuntu needs: - docker steps: @@ -125,7 +127,7 @@ jobs: docker-2: runs-on: ubuntu-latest env: - REGISTRY_NAME: cbonamy/sedfoam_2406_ubuntu + REGISTRY_IMAGE: cbonamy/sedfoam_2406_ubuntu needs: merge strategy: fail-fast: false @@ -169,7 +171,7 @@ jobs: outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true context: docker file: docker/Dockerfile_comp - tags: ${{ env.REGISTRY_NAME }} + #tags: ${{ env.REGISTRY_IMAGE }} - name: Export digest @@ -188,6 +190,8 @@ jobs: merge-2: runs-on: ubuntu-latest + env: + REGISTRY_IMAGE: cbonamy/sedfoam_2406_ubuntu needs: - docker-2 steps: @@ -226,7 +230,7 @@ jobs: docker-nb: runs-on: ubuntu-latest env: - REGISTRY_NAME: cbonamy/sedfoam_2406_notebook + REGISTRY_IMAGE: cbonamy/sedfoam_2406_notebook needs: merge-2 strategy: fail-fast: false @@ -270,7 +274,7 @@ jobs: outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true context: docker file: docker/Dockerfile_nb - tags: ${{ env.REGISTRY_NAME }} + #tags: ${{ env.REGISTRY_IMAGE }} - name: Export digest @@ -289,6 +293,8 @@ jobs: merge-nb: runs-on: ubuntu-latest + env: + REGISTRY_IMAGE: cbonamy/sedfoam_2406_notebook needs: - docker-nb steps: From a2dfab4bd3ed1dcbe61c63698d618b7016895d8e Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Fri, 15 Nov 2024 09:33:57 +0100 Subject: [PATCH 28/29] testets --- docker/Dockerfile_comp | 2 +- docker/Dockerfile_fordev | 28 ++++++++++++++-------------- docker/Dockerfile_nb | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docker/Dockerfile_comp b/docker/Dockerfile_comp index 8eddd6df..c3ea8946 100644 --- a/docker/Dockerfile_comp +++ b/docker/Dockerfile_comp @@ -1,4 +1,4 @@ -FROM cbonamy/openfoam_2406_ubuntu +FROM cbonamy/openfoam_2406_ubuntu:develop LABEL maintainer="cyrille.bonamy@univ-grenoble-alpes.fr" ARG WM_NCOMPPROCS=10 ARG DEBIAN_FRONTEND=noninteractive diff --git a/docker/Dockerfile_fordev b/docker/Dockerfile_fordev index c5fdd145..449743a7 100644 --- a/docker/Dockerfile_fordev +++ b/docker/Dockerfile_fordev @@ -3,24 +3,24 @@ LABEL maintainer="cyrille.bonamy@univ-grenoble-alpes.fr" ARG WM_NCOMPPROCS=10 ARG DEBIAN_FRONTEND=noninteractive -#RUN update-ca-certificates && apt-get update \ -# && apt-get install --no-install-recommends -y \ -# python3-pip python3-dev python-is-python3 ipython3 python3-tk \ -# unzip git mercurial libreadline-dev vim nano emacs python3-venv \ -# && apt-get clean \ -# && rm -rf /var/lib/apt/lists/* -#RUN python3 -m venv /home/sudofoam/pyenv +RUN update-ca-certificates && apt-get update \ + && apt-get install --no-install-recommends -y \ + python3-pip python3-dev python-is-python3 ipython3 python3-tk \ + unzip git mercurial libreadline-dev vim nano emacs python3-venv \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* +RUN python3 -m venv /home/sudofoam/pyenv -#RUN /bin/bash -c 'shopt -s expand_aliases && source /home/sudofoam/pyenv/bin/activate && pip3 install --no-cache-dir fluidfoam pandas matplotlib odfpy black' +RUN /bin/bash -c 'shopt -s expand_aliases && source /home/sudofoam/pyenv/bin/activate && pip3 install --no-cache-dir fluidfoam pandas matplotlib odfpy black' -#WORKDIR /root/ -#RUN git clone --branch develop --recurse-submodules https://github.com/sedfoam/sedfoam.git --depth 1 +WORKDIR /root/ +RUN git clone --branch develop --recurse-submodules https://github.com/sedfoam/sedfoam.git --depth 1 -#WORKDIR /root -#RUN /bin/bash -c 'hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam -b develop && cp sedfoam/docker/Allwmakeswak swak4Foam/Libraries/Allwmake' +WORKDIR /root +RUN /bin/bash -c 'hg clone http://hg.code.sf.net/p/openfoam-extend/swak4Foam -b develop && cp sedfoam/docker/Allwmakeswak swak4Foam/Libraries/Allwmake' -#WORKDIR /root/swak4Foam -#RUN /bin/bash -c 'shopt -s expand_aliases && ./maintainanceScripts/compileRequirements.sh' +WORKDIR /root/swak4Foam +RUN /bin/bash -c 'shopt -s expand_aliases && ./maintainanceScripts/compileRequirements.sh' USER 1001 diff --git a/docker/Dockerfile_nb b/docker/Dockerfile_nb index 6612c5de..845e5a7d 100644 --- a/docker/Dockerfile_nb +++ b/docker/Dockerfile_nb @@ -1,4 +1,4 @@ -FROM cbonamy/sedfoam_2406_ubuntu +FROM cbonamy/sedfoam_2406_ubuntu:develop LABEL maintainer="cyrille.bonamy@univ-grenoble-alpes.fr" ARG WM_NCOMPPROCS=10 From 6ff1dec2b95a04f55fb58d465a2f11d75a653be9 Mon Sep 17 00:00:00 2001 From: Cyrille Bonamy Date: Sun, 17 Nov 2024 00:23:50 +0100 Subject: [PATCH 29/29] debug + commit with vs --- .github/workflows/docker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 994884fd..23a0373f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -183,7 +183,7 @@ jobs: - name: Upload digest uses: actions/upload-artifact@v4 with: - name: digests-${{ env.PLATFORM_PAIR }} + name: digests2-${{ env.PLATFORM_PAIR }} path: /tmp/digests/* if-no-files-found: error retention-days: 1 @@ -199,7 +199,7 @@ jobs: uses: actions/download-artifact@v4 with: path: /tmp/digests - pattern: digests-* + pattern: digests2-* merge-multiple: true - name: Set up Docker Buildx @@ -286,7 +286,7 @@ jobs: - name: Upload digest uses: actions/upload-artifact@v4 with: - name: digests-${{ env.PLATFORM_PAIR }} + name: digests3-${{ env.PLATFORM_PAIR }} path: /tmp/digests/* if-no-files-found: error retention-days: 1 @@ -302,7 +302,7 @@ jobs: uses: actions/download-artifact@v4 with: path: /tmp/digests - pattern: digests-* + pattern: digests3-* merge-multiple: true - name: Set up Docker Buildx