Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions dockerfiles/Dockerfile.spack-gmds
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#============== OS LAYER ==================
FROM ubuntu:22.04
#==========================================
ARG SPACK_VERSION=0.22.2
ARG SPACK_VERSION=0.23.1
# METADATA OF THE IMAGE
LABEL description="GMDS image built with spack" \
version.ubuntu="22.04" \
Expand All @@ -22,9 +22,9 @@ RUN apt update &&\
apt clean &&\
rm -rf /var/lib/apt/lists/*
#==========================================
RUN wget https://github.com/Kitware/CMake/releases/download/v3.30.5/cmake-3.30.5-linux-x86_64.tar.gz
RUN tar xvf cmake-3.30.5-linux-x86_64.tar.gz
RUN cp -r cmake-3.30.5-linux-x86_64/* /usr/
RUN wget https://github.com/Kitware/CMake/releases/download/v3.31.8/cmake-3.31.8-linux-x86_64.tar.gz
RUN tar xvf cmake-3.31.8-linux-x86_64.tar.gz
RUN cp -r cmake-3.31.8-linux-x86_64/* /usr/
#==========================================
RUN pip install pytest
#==========================================
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.spack-gmds-macos
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#============== OS LAYER ==================
FROM sickcodes/docker-osx
#==========================================
ARG SPACK_VERSION=0.22.2
ARG SPACK_VERSION=0.23.1
# METADATA OF THE IMAGE
LABEL description="GMDS image built with spack for macos" \
version.spack=${SPACK_VERSION}
Expand Down
8 changes: 4 additions & 4 deletions dockerfiles/Dockerfile.spack-magix3d
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Ubuntu 22.04 allows to execute glxgears in a docker container
FROM ubuntu:24.04
#==========================================
ARG SPACK_VERSION=0.22.2
ARG SPACK_VERSION=0.23.1
# METADATA OF THE IMAGE
LABEL description="Magix3d image built with spack" \
version.ubuntu="24.04" \
Expand All @@ -26,9 +26,9 @@ RUN apt update &&\
apt clean &&\
rm -rf /var/lib/apt/lists/*
#==========================================
RUN wget https://github.com/Kitware/CMake/releases/download/v3.30.5/cmake-3.30.5-linux-x86_64.tar.gz
RUN tar xvf cmake-3.30.5-linux-x86_64.tar.gz
RUN cp -r cmake-3.30.5-linux-x86_64/* /usr/
RUN wget https://github.com/Kitware/CMake/releases/download/v3.31.8/cmake-3.31.8-linux-x86_64.tar.gz
RUN tar xvf cmake-3.31.8-linux-x86_64.tar.gz
RUN cp -r cmake-3.31.8-linux-x86_64/* /usr/
#==========================================
# Installation of firefox for magix3d documentation (wget installed above)
RUN wget -O FirefoxSetup.tar.bz2 "https://download.mozilla.org/?product=firefox-latest&os=linux64" &&\
Expand Down