Skip to content

Commit 3d0c258

Browse files
authored
Merge pull request #125 from pynbody/docker-fix
Fix missing HighFive git submodule in docker build
2 parents e2641df + 98ff327 commit 3d0c258

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.github/workflows/docker.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ jobs:
1313
environment: Docker
1414
steps:
1515
- uses: actions/checkout@v2
16+
with:
17+
submodules: recursive
1618

1719
- name: Determine version tag
1820
run: echo "VERSION_TAG=`git describe --tags | cut -c 2-`" >> $GITHUB_ENV
@@ -21,22 +23,22 @@ jobs:
2123
run: echo Version is ${{ env.VERSION_TAG }}
2224

2325
- name: Login to Dockerhub
24-
uses: docker/login-action@v1
26+
uses: docker/login-action@v3
2527
with:
2628
username: ${{ secrets.DOCKERHUB_USERNAME }}
2729
password: ${{ secrets.DOCKERHUB_TOKEN }}
2830

2931
- name: Set up QEMU
30-
uses: docker/setup-qemu-action@v1
32+
uses: docker/setup-qemu-action@v3
3133
with:
3234
platforms: all
3335

3436
- name: Set up Docker Buildx
35-
uses: docker/setup-buildx-action@v1
37+
uses: docker/setup-buildx-action@v3
3638

3739
- name: Build and push
3840
id: docker_build
39-
uses: docker/build-push-action@v2
41+
uses: docker/build-push-action@v6
4042
with:
4143
builder: ${{ steps.buildx.outputs.name }}
4244
context: ./genetIC

genetIC/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM ubuntu:24.04
22
COPY ./ /genetIC
33

44
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y g++-12 libgsl-dev libfftw3-dev python3-pip pkg-config libhdf5-serial-dev
5-
RUN pip3 install pynbody --break-system-packages # should use a venv but this is simpler for now
5+
RUN pip3 install --pre pynbody --break-system-packages # should use a venv but this is simpler for now
66
RUN cd /genetIC && make clean && make
77

88
ENTRYPOINT ["/genetIC/genetIC"]

0 commit comments

Comments
 (0)