Merge remote-tracking branch 'upstream/master' into rebased_splicePot…

…ential
pynbody · Oct 6, 2024 · 3ec60ca · 3ec60ca
2 parents a174415 + 3d0c258
commit 3ec60ca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -13,6 +13,8 @@ jobs:
     environment: Docker
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
 
       - name: Determine version tag
         run: echo "VERSION_TAG=`git describe --tags | cut -c 2-`" >> $GITHUB_ENV
@@ -21,22 +23,22 @@ jobs:
         run: echo Version is ${{ env.VERSION_TAG }}
 
       - name: Login to Dockerhub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: all
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: ./genetIC

diff --git a/genetIC/Dockerfile b/genetIC/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:24.04
 COPY ./ /genetIC
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y g++-12 libgsl-dev libfftw3-dev python3-pip pkg-config libhdf5-serial-dev
-RUN pip3 install pynbody --break-system-packages # should use a venv but this is simpler for now
+RUN pip3 install --pre pynbody --break-system-packages # should use a venv but this is simpler for now
 RUN cd /genetIC && make clean && make
 
 ENTRYPOINT ["/genetIC/genetIC"]