Skip to content

Commit 2ba103e

Browse files
committed
ghci-0.2.0
1 parent 2e63097 commit 2ba103e

File tree

3 files changed

+2
-188
lines changed

3 files changed

+2
-188
lines changed

ghci/Dockerfile

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
FROM spack/ubuntu-jammy:0.22.2
2-
3-
LABEL org.opencontainers.image.source=https://github.com/E3SM-Project/containers
4-
LABEL org.opencontainers.image.description="E3SM ghci container is mainly for testing on github actions"
5-
LABEL org.opencontainers.image.licenses=BSD-3-Clause
1+
FROM ghcr.io/e3sm-project/containers-inputdata-files:main
62

73
ARG GCC_VERSION=11.4.0
84
ARG MPICH_VERSION=4.2.1
@@ -104,9 +100,6 @@ RUN cd /opt/spack-environment && spack env activate . && spack install --fail-fa
104100
RUN cd /opt/spack-environment && \
105101
spack env activate --sh -d . >> /etc/profile.d/z10_spack_environment.sh
106102

107-
ENV INPUT_DATA_DIR=/projects/e3sm/inputdata
108-
RUN mkdir -p $INPUT_DATA_DIR
109-
110103
ENV USER=ghciocitester
111104

112105
RUN git config --global user.email "${USER}@${USER}.${USER}"
@@ -118,25 +111,6 @@ ENV TZ=America/Los_Angeles
118111
ENV LANGUAGE=en_US:en \
119112
LANG=en_US.UTF-8
120113

121-
# TODO: move this to a separate image (i.e., above is "base", below is "full")?
122-
RUN mkdir -p /app/ \
123-
&& (echo "" \
124-
&& echo "cat /app/files.txt | while read -r line; do" \
125-
&& echo " file_url=\$line" \
126-
&& echo " file_loc=\${line//https\:\/\/web\.lcrc\.anl\.gov\/public\/e3sm\/inputdata/${INPUT_DATA_DIR}}" \
127-
&& echo " mkdir -p \$( dirname -- \"\$file_loc\")" \
128-
&& echo " touch \"\$file_loc\"" \
129-
&& echo " echo \"downloading from \$file_url\"" \
130-
&& echo " echo \"downloading to \$file_loc\"" \
131-
&& echo " wget -q -O \"\$file_loc\" \"\$file_url\"" \
132-
&& echo "done" \
133-
&& echo "") > /app/download.sh
134-
135-
RUN chmod +x /app/download.sh
136-
137-
COPY files.txt /app/files.txt
138-
RUN /app/download.sh
139-
140114
# TODO: maybe add a test here or in the workflow?
141115

142116
ENTRYPOINT ["/bin/bash", "--rcfile", "/etc/profile", "-l"]

ghci/files.txt

Lines changed: 0 additions & 160 deletions
This file was deleted.

ghci/readme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ Design notes
44
- the container is based on spack/ubuntu-jammy:0.22.2
55
- the container relies on binary cache to accelerate builds
66
- the container is based on gcc 11, native to ubuntu 22.04 (jammy)
7-
- the container has mpich 3.4.3, to ensure compatibility with craympich
7+
- the container has mpich 4.2.1, likely incompatibile with craympich
88
- the container houses within it (~10 GB of) data files from the inputdata server

0 commit comments

Comments
 (0)