From ad43c49d9a7bdd1de7703e034c9100add25e8700 Mon Sep 17 00:00:00 2001 From: David Schneller Date: Wed, 22 May 2024 20:19:27 +0200 Subject: [PATCH 1/5] Update GHA file --- .github/workflows/run-and-deploy-docker.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-and-deploy-docker.yaml b/.github/workflows/run-and-deploy-docker.yaml index fc28e88..078e803 100644 --- a/.github/workflows/run-and-deploy-docker.yaml +++ b/.github/workflows/run-and-deploy-docker.yaml @@ -30,12 +30,23 @@ jobs: uses: docker/metadata-action@v4 with: images: seissol/training - - name: Build and push Docker image + - name: Build and push Docker image (x86-64) uses: docker/build-push-action@v4 with: context: . file: Dockerfile_jupyterlab - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 + push: true + tags: ${{ steps.meta.outputs.tags }} + cache-from: type=gha + cache-to: type=gha,mode=max + labels: ${{ steps.meta.outputs.labels }} + - name: Build and push Docker image (ARM) + uses: docker/build-push-action@v4 + with: + context: . + file: Dockerfile_jupyterlab + platforms: linux/arm64 push: true tags: ${{ steps.meta.outputs.tags }} cache-from: type=gha From 35675283cba75d1e1843afde19197f129fb6f6f3 Mon Sep 17 00:00:00 2001 From: David Schneller Date: Wed, 22 May 2024 20:20:47 +0200 Subject: [PATCH 2/5] Fix pumgen version jupyterlab --- Dockerfile_jupyterlab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile_jupyterlab b/Dockerfile_jupyterlab index 2d71c4f..1f53a0b 100644 --- a/Dockerfile_jupyterlab +++ b/Dockerfile_jupyterlab @@ -127,7 +127,7 @@ RUN git clone --recursive --depth 1 --single-branch --branch v2.2.7 https://gith && cmake .. -DCMAKE_INSTALL_PREFIX=/home/tools -DCMAKE_C_COMPILER=mpicc -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_BUILD_TYPE=Release -DSCOREC_CXX_FLAGS="-Wno-error=array-bounds" \ && make -j$(nproc) && make install -RUN git clone --recursive https://github.com/SeisSol/PUMGen.git \ +RUN git clone --recursive --branch v1.0.1 https://github.com/SeisSol/PUMGen.git \ && cd PUMGen \ && mkdir build && cd build \ && cmake .. -DCMAKE_INSTALL_PREFIX=/home/tools -DCMAKE_C_COMPILER=mpicc -DCMAKE_CXX_COMPILER=mpicxx -DCMAKE_BUILD_TYPE=Release \ From 3ad31e79de5c27aa1c0b6c6dfb343c30c8a48825 Mon Sep 17 00:00:00 2001 From: David Schneller Date: Wed, 22 May 2024 20:46:12 +0200 Subject: [PATCH 3/5] Build the correct notebook --- .github/workflows/run-and-deploy-docker.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-and-deploy-docker.yaml b/.github/workflows/run-and-deploy-docker.yaml index 078e803..6165222 100644 --- a/.github/workflows/run-and-deploy-docker.yaml +++ b/.github/workflows/run-and-deploy-docker.yaml @@ -30,17 +30,27 @@ jobs: uses: docker/metadata-action@v4 with: images: seissol/training + - name: Prepare x86-64 label + uses: docker/metadata-action@v4 + with: + flavor: | + suffix=x86_64 - name: Build and push Docker image (x86-64) uses: docker/build-push-action@v4 with: context: . - file: Dockerfile_jupyterlab + file: Dockerfile platforms: linux/amd64 push: true tags: ${{ steps.meta.outputs.tags }} cache-from: type=gha cache-to: type=gha,mode=max labels: ${{ steps.meta.outputs.labels }} + - name: Prepare ARM label + uses: docker/metadata-action@v4 + with: + flavor: | + suffix=arm - name: Build and push Docker image (ARM) uses: docker/build-push-action@v4 with: @@ -52,3 +62,4 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max labels: ${{ steps.meta.outputs.labels }} + From 76d45ff90cef4bd91fd9096ba2c68a58d76066a1 Mon Sep 17 00:00:00 2001 From: David Schneller Date: Wed, 22 May 2024 20:48:18 +0200 Subject: [PATCH 4/5] Retry tagging --- .github/workflows/run-and-deploy-docker.yaml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/run-and-deploy-docker.yaml b/.github/workflows/run-and-deploy-docker.yaml index 6165222..fd2a5ab 100644 --- a/.github/workflows/run-and-deploy-docker.yaml +++ b/.github/workflows/run-and-deploy-docker.yaml @@ -30,11 +30,6 @@ jobs: uses: docker/metadata-action@v4 with: images: seissol/training - - name: Prepare x86-64 label - uses: docker/metadata-action@v4 - with: - flavor: | - suffix=x86_64 - name: Build and push Docker image (x86-64) uses: docker/build-push-action@v4 with: @@ -42,15 +37,10 @@ jobs: file: Dockerfile platforms: linux/amd64 push: true - tags: ${{ steps.meta.outputs.tags }} + tags: latest-x86 #${{ steps.meta.outputs.tags }} cache-from: type=gha cache-to: type=gha,mode=max labels: ${{ steps.meta.outputs.labels }} - - name: Prepare ARM label - uses: docker/metadata-action@v4 - with: - flavor: | - suffix=arm - name: Build and push Docker image (ARM) uses: docker/build-push-action@v4 with: @@ -58,7 +48,7 @@ jobs: file: Dockerfile_jupyterlab platforms: linux/arm64 push: true - tags: ${{ steps.meta.outputs.tags }} + tags: latest-arm #${{ steps.meta.outputs.tags }} cache-from: type=gha cache-to: type=gha,mode=max labels: ${{ steps.meta.outputs.labels }} From bcaae9395329044e68d33799c7fc5b01faf873d4 Mon Sep 17 00:00:00 2001 From: David Schneller Date: Wed, 22 May 2024 21:05:53 +0200 Subject: [PATCH 5/5] Another test --- .github/workflows/run-and-deploy-docker.yaml | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/run-and-deploy-docker.yaml b/.github/workflows/run-and-deploy-docker.yaml index fd2a5ab..2623a39 100644 --- a/.github/workflows/run-and-deploy-docker.yaml +++ b/.github/workflows/run-and-deploy-docker.yaml @@ -37,19 +37,19 @@ jobs: file: Dockerfile platforms: linux/amd64 push: true - tags: latest-x86 #${{ steps.meta.outputs.tags }} - cache-from: type=gha - cache-to: type=gha,mode=max - labels: ${{ steps.meta.outputs.labels }} - - name: Build and push Docker image (ARM) - uses: docker/build-push-action@v4 - with: - context: . - file: Dockerfile_jupyterlab - platforms: linux/arm64 - push: true - tags: latest-arm #${{ steps.meta.outputs.tags }} + tags: ${{ steps.meta.outputs.tags }} cache-from: type=gha cache-to: type=gha,mode=max labels: ${{ steps.meta.outputs.labels }} + #- name: Build and push Docker image (ARM) + # uses: docker/build-push-action@v4 + # with: + # context: . + # file: Dockerfile_jupyterlab + # platforms: linux/arm64 + # push: true + # tags: ${{ steps.meta.outputs.tags }} + # cache-from: type=gha + # cache-to: type=gha,mode=max + # labels: ${{ steps.meta.outputs.labels }}