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

Update GHA script to build both containers from different files #50

Closed
wants to merge 5 commits into from
+16 −4
Closed

Update GHA script to build both containers from different files #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad43c49
Update GHA file
davschneller May 22, 2024
3567528
Fix pumgen version jupyterlab
davschneller May 22, 2024
3ad31e7
Build the correct notebook
davschneller May 22, 2024
76d45ff
Retry tagging
davschneller May 22, 2024
bcaae93
Another test
davschneller May 22, 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
18 changes: 15 additions & 3 deletions .github/workflows/run-and-deploy-docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,26 @@ 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
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: 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 }}

2 changes: 1 addition & 1 deletion Dockerfile_jupyterlab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Loading