Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #196

Merged
merged 29 commits into from
Nov 26, 2024
Merged

Develop #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
cb69f9e
debug CI
CyrilleBonamy Nov 12, 2024
3598ac0
debug CI
CyrilleBonamy Nov 12, 2024
fe2ca89
split docker build to avoid 6h timeout limit
CyrilleBonamy Nov 12, 2024
165a1dc
debug docker nb
CyrilleBonamy Nov 12, 2024
3441727
debug docker nb
CyrilleBonamy Nov 12, 2024
cc19b3d
test debug timeout 6h for CI
CyrilleBonamy Nov 13, 2024
afbd4e5
debug test
CyrilleBonamy Nov 13, 2024
63fa02f
test debug timeout 6h for CI 2
CyrilleBonamy Nov 13, 2024
00abf9b
test debug timeout 6h for CI 3
CyrilleBonamy Nov 13, 2024
21d1cd8
try macos-latest docker to speed up arm docker build
CyrilleBonamy Nov 13, 2024
4aef30c
try macos-latest docker
CyrilleBonamy Nov 13, 2024
4d661b4
add docker builds ARM
CyrilleBonamy Nov 13, 2024
f620b61
add docker arm
CyrilleBonamy Nov 13, 2024
e61b879
try split docker build
CyrilleBonamy Nov 13, 2024
7140890
update docker
CyrilleBonamy Nov 13, 2024
410eb33
update docker_nb to avoid warning
CyrilleBonamy Nov 14, 2024
2634aa4
docker build...
CyrilleBonamy Nov 14, 2024
f5b5f0c
rtest
CyrilleBonamy Nov 14, 2024
1d71700
rtestsdsd
CyrilleBonamy Nov 14, 2024
69b1053
rt
CyrilleBonamy Nov 14, 2024
2ef423b
sss
CyrilleBonamy Nov 14, 2024
1b436cb
ssq
CyrilleBonamy Nov 14, 2024
43b66c2
s
CyrilleBonamy Nov 14, 2024
143cc77
aaa
CyrilleBonamy Nov 14, 2024
71c53a8
up test
CyrilleBonamy Nov 15, 2024
ae211ad
up te
CyrilleBonamy Nov 15, 2024
d13347e
up
CyrilleBonamy Nov 15, 2024
a2dfab4
testets
CyrilleBonamy Nov 15, 2024
6ff1dec
debug + commit with vs
CyrilleBonamy Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
307 changes: 278 additions & 29 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -29,54 +26,306 @@ jobs:
docker:
runs-on: ubuntu-latest
env:
IMAGE_NAME: sedfoam_2406_ubuntu
needs: build
REGISTRY_IMAGE: cbonamy/openfoam_2406_ubuntu
#needs: build
strategy:
fail-fast: false
matrix:
platform:
- linux/amd64
- linux/arm64
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Prepare
run: |
platform=${{ matrix.platform }}
echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV

- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
platforms: 'arm64'
images: ${{ env.REGISTRY_IMAGE }}

- name: Set up QEMU
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

- 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
push: true
platforms: linux/amd64,linux/arm64
tags: cbonamy/${{ env.IMAGE_NAME }}:latest
file: docker/Dockerfile_fordev
#tags: ${{ env.REGISTRY_IMAGE }}

docker_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:
runs-on: ubuntu-latest
env:
IMAGE_NAME: sedfoam_2406_notebook
needs: docker
REGISTRY_IMAGE: cbonamy/openfoam_2406_ubuntu
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:
REGISTRY_IMAGE: cbonamy/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@v2
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
#tags: ${{ env.REGISTRY_IMAGE }}


- 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: digests2-${{ env.PLATFORM_PAIR }}
path: /tmp/digests/*
if-no-files-found: error
retention-days: 1

merge-2:
runs-on: ubuntu-latest
env:
REGISTRY_IMAGE: cbonamy/sedfoam_2406_ubuntu
needs:
- docker-2
steps:
- name: Download digests
uses: actions/download-artifact@v4
with:
platforms: 'arm64,arm'
path: /tmp/digests
pattern: digests2-*
merge-multiple: true

- 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: 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: Build and push
uses: docker/build-push-action@v3

- 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:
REGISTRY_IMAGE: cbonamy/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
push: true
platforms: linux/amd64,linux/arm64
tags: cbonamy/${{ env.IMAGE_NAME }}:latest
#tags: ${{ env.REGISTRY_IMAGE }}


- 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: digests3-${{ env.PLATFORM_PAIR }}
path: /tmp/digests/*
if-no-files-found: error
retention-days: 1

merge-nb:
runs-on: ubuntu-latest
env:
REGISTRY_IMAGE: cbonamy/sedfoam_2406_notebook
needs:
- docker-nb
steps:
- name: Download digests
uses: actions/download-artifact@v4
with:
path: /tmp/digests
pattern: digests3-*
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 }}
Loading