diff --git a/contributing b/contributing index dafe4d5..205f026 100644 --- a/contributing +++ b/contributing @@ -6,6 +6,6 @@ publicly. In the xyz folder, you can specify your container via a Dockerfile (or equivalent). To build the container, add a github actions workflow under .github/workflows named xyz.yaml. Name the image "containers-xyz", and have the workflow act only on the files added (folder xyz and workflow file). Also, -tag and release the container with xyz-v1.2.3. +tag and release the container with xyz-1.2.3. See the example provided by the ghci container. diff --git a/ghci/Dockerfile b/ghci/Dockerfile index a8a9491..a7d37c1 100644 --- a/ghci/Dockerfile +++ b/ghci/Dockerfile @@ -1,6 +1,8 @@ FROM spack/ubuntu-jammy:0.22.2 +LABEL org.opencontainers.image.source=https://github.com/E3SM-Project/containers LABEL org.opencontainers.image.description="E3SM ghci container is mainly for testing on github actions" +LABEL org.opencontainers.image.licenses=BSD-3-Clause ARG GCC_VERSION=11.4.0 ARG MPICH_VERSION=3.4.3 @@ -50,6 +52,11 @@ RUN mkdir -p /opt/spack-environment \ && echo " - yaml-cpp" \ && echo " - fmt" \ && echo " - spdlog" \ +&& echo " - python" \ +&& echo " - py-pyyaml" \ +&& echo " - py-psutil" \ +&& echo " - py-netcdf4" \ +&& echo " - py-nanobind" \ && echo " " \ && echo " specs:" \ && echo " - szip" \ diff --git a/ghci/readme b/ghci/readme index 33a5ca7..e3d3695 100644 --- a/ghci/readme +++ b/ghci/readme @@ -1,7 +1,7 @@ The ghci container is mainly for testing on github actions Design notes -- the container is based on spack/ubuntu-jammy:0.22.1 +- the container is based on spack/ubuntu-jammy:0.22.2 - the container relies on binary cache to accelerate builds - the container is based on gcc 11, native to ubuntu 22.04 (jammy) - the container has mpich 3.4.3, to ensure compatibility with craympich