Merge pull request #282 from eschnett/eschnett/docker-update

CI: Update to reprimand 1.7
EinsteinToolkit · May 15, 2024 · 066dd52 · 066dd52
2 parents 5c05812 + 8c0c0a6
commit 066dd52
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 27 deletions.
diff --git a/docker/carpetx-arm64v8-cpu.dockerfile b/docker/carpetx-arm64v8-cpu.dockerfile
@@ -1,13 +1,14 @@
 # How to build this Docker image:
 
-#     docker build --file carpetx-cpu.dockerfile --tag einsteintoolkit/carpetx:cpu-real64 .
-#     docker push einsteintoolkit/carpetx:cpu-real64
+#     docker build --file carpetx-arm64v8-cpu.dockerfile --tag einsteintoolkit/carpetx:arm64v8-cpu-real64 .
+#     docker push einsteintoolkit/carpetx:arm64v8-cpu-real64
 
-#     docker build --build-arg real_precision=real32 --file carpetx-cpu.dockerfile --tag einsteintoolkit/carpetx:cpu-real32 .
-#     docker push einsteintoolkit/carpetx:cpu-real32
+#     docker build --build-arg real_precision=real32 --file carpetx-arm64v8-cpu.dockerfile --tag einsteintoolkit/carpetx:arm64v8-cpu-real32 .
+#     docker push einsteintoolkit/carpetx:arm64v8-cpu-real32
 
 # noble is ubuntu:24.04
-FROM arm64v8/ubuntu:noble-20240423
+# FROM arm64v8/ubuntu:noble-20240423
+FROM arm64v8/ubuntu:noble-20240429
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LANGUAGE=en_US.en \
@@ -195,9 +196,9 @@ RUN mkdir src && \
 # RePrimAnd is a physics package for nuclear equations of state
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/wokast/RePrimAnd/archive/refs/tags/v1.6.tar.gz && \
-    tar xzf v1.6.tar.gz && \
-    cd RePrimAnd-1.6 && \
+    wget https://github.com/wokast/RePrimAnd/archive/refs/tags/v1.7.tar.gz && \
+    tar xzf v1.7.tar.gz && \
+    cd RePrimAnd-1.7 && \
     meson build --buildtype=release --prefix=/usr/local && \
     ninja -C build && \
     ninja -C build install && \

diff --git a/docker/carpetx-cpu.dockerfile b/docker/carpetx-cpu.dockerfile
@@ -6,10 +6,9 @@
 #     docker build --build-arg real_precision=real32 --file carpetx-cpu.dockerfile --tag einsteintoolkit/carpetx:cpu-real32 .
 #     docker push einsteintoolkit/carpetx:cpu-real32
 
-# jammy is ubuntu:22.04
-# FROM ubuntu:jammy-20240227
 # noble is ubuntu:24.04
-FROM ubuntu:noble-20240423
+# FROM ubuntu:noble-20240423
+FROM ubuntu:noble-20240429
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LANGUAGE=en_US.en \
@@ -197,9 +196,9 @@ RUN mkdir src && \
 # RePrimAnd is a physics package for nuclear equations of state
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/wokast/RePrimAnd/archive/refs/tags/v1.6.tar.gz && \
-    tar xzf v1.6.tar.gz && \
-    cd RePrimAnd-1.6 && \
+    wget https://github.com/wokast/RePrimAnd/archive/refs/tags/v1.7.tar.gz && \
+    tar xzf v1.7.tar.gz && \
+    cd RePrimAnd-1.7 && \
     meson build --buildtype=release --prefix=/usr/local && \
     ninja -C build && \
     ninja -C build install && \

diff --git a/docker/carpetx-cuda.dockerfile b/docker/carpetx-cuda.dockerfile
@@ -194,9 +194,9 @@ RUN mkdir src && \
 # RePrimAnd is a physics package for nuclear equations of state
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/wokast/RePrimAnd/archive/refs/tags/v1.6.tar.gz && \
-    tar xzf v1.6.tar.gz && \
-    cd RePrimAnd-1.6 && \
+    wget https://github.com/wokast/RePrimAnd/archive/refs/tags/v1.7.tar.gz && \
+    tar xzf v1.7.tar.gz && \
+    cd RePrimAnd-1.7 && \
     meson build --buildtype=release --prefix=/usr/local && \
     ninja -C build && \
     ninja -C build install && \

diff --git a/docker/carpetx-oneapi.dockerfile b/docker/carpetx-oneapi.dockerfile
@@ -1,4 +1,3 @@
-
 # How to build this Docker image:
 
 #     docker build --file carpetx-oneapi.dockerfile --tag einsteintoolkit/carpetx:oneapi-real64 .
@@ -160,9 +159,9 @@ RUN mkdir src && \
 # RePrimAnd is a physics package for nuclear equations of state
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/wokast/RePrimAnd/archive/refs/tags/v1.6.tar.gz && \
-    tar xzf v1.6.tar.gz && \
-    cd RePrimAnd-1.6 && \
+    wget https://github.com/wokast/RePrimAnd/archive/refs/tags/v1.7.tar.gz && \
+    tar xzf v1.7.tar.gz && \
+    cd RePrimAnd-1.7 && \
     meson build --buildtype=release --prefix=/usr/local && \
     ninja -C build && \
     ninja -C build install && \

diff --git a/docker/carpetx-rocm.dockerfile b/docker/carpetx-rocm.dockerfile
@@ -1,4 +1,3 @@
-
 # How to build this Docker image:
 
 #     docker build --file carpetx-rocm.dockerfile --tag einsteintoolkit/carpetx:rocm-real64 .
@@ -7,8 +6,8 @@
 #     docker build --build-arg real_precision=real32 --file carpetx-rocm.dockerfile --tag einsteintoolkit/carpetx:rocm-real32 .
 #     docker push einsteintoolkit/carpetx:rocm-real32
 
-# FROM rocm/dev-ubuntu-22.04:6.0.2
-FROM rocm/dev-ubuntu-22.04:6.1
+# FROM rocm/dev-ubuntu-22.04:6.1
+FROM rocm/dev-ubuntu-22.04:6.1.1
 
 ENV DEBIAN_FRONTEND=noninteractive \
     LANGUAGE=en_US.UTF-8 \
@@ -197,9 +196,9 @@ RUN mkdir src && \
 # RePrimAnd is a physics package for nuclear equations of state
 RUN mkdir src && \
     (cd src && \
-    wget https://github.com/wokast/RePrimAnd/archive/refs/tags/v1.6.tar.gz && \
-    tar xzf v1.6.tar.gz && \
-    cd RePrimAnd-1.6 && \
+    wget https://github.com/wokast/RePrimAnd/archive/refs/tags/v1.7.tar.gz && \
+    tar xzf v1.7.tar.gz && \
+    cd RePrimAnd-1.7 && \
     meson build --buildtype=release --prefix=/usr/local && \
     ninja -C build && \
     ninja -C build install && \