Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • containers/eic_container
  • wdconinc/eic_container
  • tooba/eic_container
3 results
Show changes
Commits on Source (2)
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ e92b8ce1
...@@ -63,8 +63,8 @@ workflow: ...@@ -63,8 +63,8 @@ workflow:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- if: '$CI_PIPELINE_SOURCE == "web"' - if: '$CI_PIPELINE_SOURCE == "web"'
- if: '$CI_COMMIT_BRANCH == "master"' - if: '$CI_COMMIT_BRANCH == "master"'
- if: '$CI_COMMIT_BRANCH =~ /^v[0-9]+\.[0-9]+-\(alpha\|beta\|stable\)/' ## main stable branch: vX.Y-stable - if: '$CI_COMMIT_BRANCH =~ /^v[0-9]+\.[0-9]+-(alpha|beta|stable)/' ## main stable branch: vX.Y-stable
- if: '$CI_COMMIT_BRANCH =~ /^v[0-9]+\.[0-9]+-[a-z]+-\(alpha\|beta\|stable\)/' ## special stable branch: vX.Y-acadia-stable (etc) - if: '$CI_COMMIT_BRANCH =~ /^v[0-9]+\.[0-9]+-[a-z]+-(alpha|beta|stable)/' ## special stable branch: vX.Y-acadia-stable (etc)
- if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+/' ## commit tags start with vX.Y.Z with optional suffix - if: '$CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+/' ## commit tags start with vX.Y.Z with optional suffix
## plan: ## plan:
......
containers/debian/base.Dockerfile
View file @ e92b8ce1
...@@ -17,13 +17,13 @@ ENV CLICOLOR_FORCE=1 \ ...@@ -17,13 +17,13 @@ ENV CLICOLOR_FORCE=1 \
## Install additional packages. Remove the auto-cleanup functionality ## Install additional packages. Remove the auto-cleanup functionality
## for docker, as we're using the new buildkit cache instead. ## for docker, as we're using the new buildkit cache instead.
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \ --mount=type=cache,target=/var/lib/apt/lists,sharing=locked <<EOF
rm -f /etc/apt/apt.conf.d/docker-clean \ rm -f /etc/apt/apt.conf.d/docker-clean
&& ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime \ ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
&& echo "US/Eastern" > /etc/timezone \ echo "US/Eastern" > /etc/timezone
&& apt-get -yqq update \ apt-get -yqq update
&& apt-get -yqq install --no-install-recommends \ apt-get -yqq install --no-install-recommends \
bc \ bc \
bzip2 \ bzip2 \
ca-certificates \ ca-certificates \
...@@ -53,50 +53,40 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ ...@@ -53,50 +53,40 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
time \ time \
unzip \ unzip \
vim-nox \ vim-nox \
wget \ wget
&& apt-get -yqq autoremove \ apt-get -yqq autoremove
&& localedef -i en_US -f UTF-8 en_US.UTF-8 localedef -i en_US -f UTF-8 en_US.UTF-8
EOF
# Install updated compilers, with support for multiple base images # Install updated compilers, with support for multiple base images
## Ubuntu: latest gcc from toolchain ppa, latest stable clang ## Ubuntu: latest gcc from toolchain ppa, latest stable clang
## Debian: default gcc with distribution, latest stable clang ## Debian: default gcc with distribution, latest stable clang
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked \ --mount=type=cache,target=/var/lib/apt/lists,sharing=locked <<EOF
. /etc/os-release \ . /etc/os-release
&& mkdir -p /etc/apt/source.list.d \ mkdir -p /etc/apt/source.list.d
&& if [ "${ID}" = "ubuntu" ] ; then \ if [ "${ID}" = "ubuntu" ] ; then
echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu/ \ echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu/${VERSION_CODENAME} main" > /etc/apt/source.list.d/ubuntu-toolchain.list
${VERSION_CODENAME} main" \ if [ "${VERSION_ID}" = "20.04" ] ; then GCC="-10" CLANG="-12" ; fi
> /etc/apt/source.list.d/ubuntu-toolchain.list \ if [ "${VERSION_ID}" = "22.04" ] ; then GCC="-12" CLANG="-14" ; fi
&& if [ "${VERSION_ID}" = "20.04" ] ; then GCC="-10" CLANG="-12" ; fi\ curl -s https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
&& if [ "${VERSION_ID}" = "22.04" ] ; then GCC="-12" CLANG="-14" ; fi\ echo "deb http://apt.llvm.org/${VERSION_CODENAME} llvm-toolchain-${VERSION_CODENAME}${CLANG} main" > /etc/apt/source.list.d/llvm.list
&& curl -s https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -\ apt-get -yqq update
&& echo "deb http://apt.llvm.org/${VERSION_CODENAME} \ apt-get -yqq install gcc${GCC} g++${GCC} gfortran${GCC}
llvm-toolchain-${VERSION_CODENAME}${CLANG} main" \ apt-get -yqq install clang${CLANG} clang-tidy${CLANG} clang-format${CLANG}
> /etc/apt/source.list.d/llvm.list \ apt-get -yqq install iwyu
&& apt-get -yqq update \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc${GCC} 100
&& apt-get -yqq install \ update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++${GCC} 100
gcc${GCC} g++${GCC} gfortran${GCC} \ update-alternatives --install /usr/bin/gfortran gfortran /usr/bin/gfortran${GCC} 100
&& apt-get -yqq install \ update-alternatives --install /usr/bin/clang clang /usr/bin/clang${CLANG} 100
clang${CLANG} clang-tidy${CLANG} clang-format${CLANG} \ update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++${CLANG} 100
iwyu \ else
&& update-alternatives --install /usr/bin/gcc gcc \ apt-get -yqq update
/usr/bin/gcc${GCC} 100 \ apt-get -yqq install gcc g++ gfortran
&& update-alternatives --install /usr/bin/g++ g++ \ apt-get -yqq install clang clang-tidy clang-format
/usr/bin/g++${GCC} 100 \ apt-get -yqq install iwyu
&& update-alternatives --install /usr/bin/gfortran gfortran \ fi
/usr/bin/gfortran${GCC} 100 \ apt-get -yqq autoremove
&& update-alternatives --install /usr/bin/clang clang \ gcc --version
/usr/bin/clang${CLANG} 100 \ clang --version
&& update-alternatives --install /usr/bin/clang++ clang++ \ EOF
/usr/bin/clang++${CLANG} 100 \
; else \
apt-get -yqq update \
&& apt-get -yqq install \
gcc g++ gfortran \
clang clang-tidy clang-format \
iwyu \
; fi \
&& apt-get -yqq autoremove \
&& gcc --version \
&& clang --version
containers/jug/dev.Dockerfile
View file @ e92b8ce1
...@@ -12,15 +12,16 @@ ARG TARGETPLATFORM ...@@ -12,15 +12,16 @@ ARG TARGETPLATFORM
## install some extra spack dependencies ## install some extra spack dependencies
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=${TARGETPLATFORM} \ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=${TARGETPLATFORM} \
--mount=type=cache,target=/var/lib/apt/lists,sharing=locked,id=${TARGETPLATFORM} \ --mount=type=cache,target=/var/lib/apt/lists,sharing=locked,id=${TARGETPLATFORM} <<EOF
rm -f /etc/apt/apt.conf.d/docker-clean \ rm -f /etc/apt/apt.conf.d/docker-clean
&& apt-get -yqq update \ apt-get -yqq update
&& apt-get -yqq install --no-install-recommends \ apt-get -yqq install --no-install-recommends \
python3 \ python3 \
python3-dev \ python3-dev \
python3-distutils \ python3-distutils \
python3-boto3 \ python3-boto3 \
python-is-python3 python-is-python3
EOF
## Setup spack ## Setup spack
ENV SPACK_ROOT=/opt/spack ENV SPACK_ROOT=/opt/spack
...@@ -28,66 +29,61 @@ ARG SPACK_ORGREPO="spack/spack" ...@@ -28,66 +29,61 @@ ARG SPACK_ORGREPO="spack/spack"
ARG SPACK_VERSION="releases/v0.20" ARG SPACK_VERSION="releases/v0.20"
ARG SPACK_CHERRYPICKS="" ARG SPACK_CHERRYPICKS=""
ADD https://api.github.com/repos/${SPACK_ORGREPO}/commits/${SPACK_VERSION} /tmp/spack.json ADD https://api.github.com/repos/${SPACK_ORGREPO}/commits/${SPACK_VERSION} /tmp/spack.json
RUN git clone --filter=tree:0 https://github.com/${SPACK_ORGREPO}.git ${SPACK_ROOT} \ RUN <<EOF
&& git -C ${SPACK_ROOT} checkout ${SPACK_VERSION} \ git clone --filter=tree:0 https://github.com/${SPACK_ORGREPO}.git ${SPACK_ROOT}
&& if [ -n "${SPACK_CHERRYPICKS}" ] ; then \ git -C ${SPACK_ROOT} checkout ${SPACK_VERSION}
SPACK_CHERRYPICKS=$( \ if [ -n "${SPACK_CHERRYPICKS}" ] ; then
git -C ${SPACK_ROOT} rev-list --topo-order ${SPACK_CHERRYPICKS} \ SPACK_CHERRYPICKS=$(git -C ${SPACK_ROOT} rev-list --topo-order ${SPACK_CHERRYPICKS} | grep -m $(echo ${SPACK_CHERRYPICKS} | wc -w) "${SPACK_CHERRYPICKS}" | tac)
| grep -m $(echo ${SPACK_CHERRYPICKS} | wc -w) \ git -C ${SPACK_ROOT} cherry-pick -n ${SPACK_CHERRYPICKS}
"${SPACK_CHERRYPICKS}" \ fi
| tac \ ln -s $SPACK_ROOT/share/spack/docker/entrypoint.bash /usr/bin/docker-shell
) ; \ ln -s $SPACK_ROOT/share/spack/docker/entrypoint.bash /usr/bin/interactive-shell
git -C ${SPACK_ROOT} cherry-pick -n ${SPACK_CHERRYPICKS} ; \ ln -s $SPACK_ROOT/share/spack/docker/entrypoint.bash /usr/bin/spack-env
fi \ EOF
&& ln -s $SPACK_ROOT/share/spack/docker/entrypoint.bash \
/usr/bin/docker-shell \
&& ln -s $SPACK_ROOT/share/spack/docker/entrypoint.bash \
/usr/bin/interactive-shell \
&& ln -s $SPACK_ROOT/share/spack/docker/entrypoint.bash \
/usr/bin/spack-env
SHELL ["docker-shell"] SHELL ["docker-shell"]
## Setup build configuration ## Setup build configuration
ARG jobs=64 ARG jobs=64
RUN declare -A target=( \ RUN <<EOF
["linux/amd64"]="x86_64_v2" \ declare -A target=(["linux/amd64"]="x86_64_v2" ["linux/arm64"]="aarch64")
["linux/arm64"]="aarch64" \ target=${target[${TARGETPLATFORM}]}
) \ spack config --scope site add "packages:all:require:[target=${target}]"
&& target=${target[${TARGETPLATFORM}]} \ spack config --scope site add "packages:all:target:[${target}]"
&& spack config --scope site add "packages:all:require:[target=${target}]" \ spack config blame packages
&& spack config --scope site add "packages:all:target:[${target}]" \ spack config --scope user add "config:suppress_gpg_warnings:true"
&& spack config blame packages \ spack config --scope user add "config:build_jobs:${jobs}"
&& spack config --scope user add "config:suppress_gpg_warnings:true" \ spack config --scope user add "config:db_lock_timeout:${jobs}00"
&& spack config --scope user add "config:build_jobs:${jobs}" \ spack config --scope user add "config:source_cache:/var/cache/spack"
&& spack config --scope user add "config:db_lock_timeout:${jobs}00" \ spack config --scope user add "config:install_tree:root:/opt/software"
&& spack config --scope user add "config:source_cache:/var/cache/spack" \ spack config --scope user add "config:ccache:true"
&& spack config --scope user add "config:install_tree:root:/opt/software" \ spack config blame config
&& spack config --scope user add "config:ccache:true" \ spack compiler find --scope site
&& spack config blame config \ spack config blame compilers
&& spack compiler find --scope site \ EOF
&& spack config blame compilers
## Setup local buildcache mirrors ## Setup local buildcache mirrors
RUN --mount=type=cache,target=/var/cache/spack \ RUN --mount=type=cache,target=/var/cache/spack <<EOF
spack mirror add local /var/cache/spack/mirror/${SPACK_VERSION} \ spack mirror add local /var/cache/spack/mirror/${SPACK_VERSION}
&& spack buildcache update-index local \ spack buildcache update-index local
&& spack mirror list spack mirror list
EOF
## Setup eics3 buildcache mirrors ## Setup eics3 buildcache mirrors
## - this always adds the read-only mirror to the container ## - this always adds the read-only mirror to the container
## - the write-enabled mirror is provided later as a secret mount ## - the write-enabled mirror is provided later as a secret mount
ARG S3_ACCESS_KEY="" ARG S3_ACCESS_KEY=""
ARG S3_SECRET_KEY="" ARG S3_SECRET_KEY=""
RUN --mount=type=cache,target=/var/cache/spack \ RUN --mount=type=cache,target=/var/cache/spack <<EOF
if [ -n "${S3_ACCESS_KEY}" ] ; then \ if [ -n "${S3_ACCESS_KEY}" ] ; then
spack mirror add --scope site \ spack mirror add --scope site \
--s3-endpoint-url https://eics3.sdcc.bnl.gov:9000 \ --s3-endpoint-url https://eics3.sdcc.bnl.gov:9000 \
--s3-access-key-id "${S3_ACCESS_KEY}" \ --s3-access-key-id "${S3_ACCESS_KEY}" \
--s3-access-key-secret "${S3_SECRET_KEY}" \ --s3-access-key-secret "${S3_SECRET_KEY}" \
eics3 s3://eictest/EPIC/spack/${SPACK_VERSION} \ eics3 s3://eictest/EPIC/spack/${SPACK_VERSION}
; fi \ fi
&& spack mirror list spack mirror list
EOF
## Setup eic-spack ## Setup eic-spack
ENV EICSPACK_ROOT=${SPACK_ROOT}/var/spack/repos/eic-spack ENV EICSPACK_ROOT=${SPACK_ROOT}/var/spack/repos/eic-spack
...@@ -95,21 +91,25 @@ ARG EICSPACK_ORGREPO="eic/eic-spack" ...@@ -95,21 +91,25 @@ ARG EICSPACK_ORGREPO="eic/eic-spack"
ARG EICSPACK_VERSION="$SPACK_VERSION" ARG EICSPACK_VERSION="$SPACK_VERSION"
ARG EICSPACK_CHERRYPICKS="" ARG EICSPACK_CHERRYPICKS=""
ADD https://api.github.com/repos/${EICSPACK_ORGREPO}/commits/${EICSPACK_VERSION} /tmp/eic-spack.json ADD https://api.github.com/repos/${EICSPACK_ORGREPO}/commits/${EICSPACK_VERSION} /tmp/eic-spack.json
RUN git clone --filter=tree:0 https://github.com/${EICSPACK_ORGREPO}.git ${EICSPACK_ROOT} \ RUN <<EOF
&& git -C ${EICSPACK_ROOT} checkout ${EICSPACK_VERSION} \ git clone --filter=tree:0 https://github.com/${EICSPACK_ORGREPO}.git ${EICSPACK_ROOT}
&& if [ -n "${EICSPACK_CHERRYPICKS}" ] ; then \ git -C ${EICSPACK_ROOT} checkout ${EICSPACK_VERSION}
git -C ${EICSPACK_ROOT} cherry-pick -n ${EICSPACK_CHERRYPICKS} ; \ if [ -n "${EICSPACK_CHERRYPICKS}" ] ; then
fi \ git -C ${EICSPACK_ROOT} cherry-pick -n ${EICSPACK_CHERRYPICKS}
&& spack repo add --scope site "${EICSPACK_ROOT}" fi
spack repo add --scope site "${EICSPACK_ROOT}"
EOF
## Setup key4hep-spack ## Setup key4hep-spack
ENV KEY4HEPSPACK_ROOT=${SPACK_ROOT}/var/spack/repos/key4hep-spack ENV KEY4HEPSPACK_ROOT=${SPACK_ROOT}/var/spack/repos/key4hep-spack
ARG KEY4HEPSPACK_ORGREPO="key4hep/key4hep-spack" ARG KEY4HEPSPACK_ORGREPO="key4hep/key4hep-spack"
ARG KEY4HEPSPACK_VERSION="main" ARG KEY4HEPSPACK_VERSION="main"
ADD https://api.github.com/repos/${KEY4HEPSPACK_ORGREPO}/commits/${KEY4HEPSPACK_VERSION} /tmp/key4hep-spack.json ADD https://api.github.com/repos/${KEY4HEPSPACK_ORGREPO}/commits/${KEY4HEPSPACK_VERSION} /tmp/key4hep-spack.json
RUN git clone --filter=tree:0 https://github.com/${KEY4HEPSPACK_ORGREPO}.git ${KEY4HEPSPACK_ROOT} \ RUN <<EOF
&& git -C ${KEY4HEPSPACK_ROOT} checkout ${KEY4HEPSPACK_VERSION} \ git clone --filter=tree:0 https://github.com/${KEY4HEPSPACK_ORGREPO}.git ${KEY4HEPSPACK_ROOT}
&& spack repo add --scope site "${KEY4HEPSPACK_ROOT}" git -C ${KEY4HEPSPACK_ROOT} checkout ${KEY4HEPSPACK_VERSION}
spack repo add --scope site "${KEY4HEPSPACK_ROOT}"
EOF
## ======================================================================================== ## ========================================================================================
## STAGE1: builder ## STAGE1: builder
...@@ -128,25 +128,26 @@ ENV SPACK_ENV=/opt/spack-environment/${ENV} ...@@ -128,25 +128,26 @@ ENV SPACK_ENV=/opt/spack-environment/${ENV}
RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \ RUN --mount=type=cache,target=/ccache,id=${TARGETPLATFORM} \
--mount=type=cache,target=/var/cache/spack \ --mount=type=cache,target=/var/cache/spack \
--mount=type=secret,id=mirrors,target=/opt/spack/etc/spack/mirrors.yaml \ --mount=type=secret,id=mirrors,target=/opt/spack/etc/spack/mirrors.yaml \
source $SPACK_ROOT/share/spack/setup-env.sh \ <<EOF
&& export CCACHE_DIR=/ccache \ source $SPACK_ROOT/share/spack/setup-env.sh
&& spack buildcache update-index local \ export CCACHE_DIR=/ccache
&& spack buildcache update-index eics3rw \ spack buildcache update-index local
&& spack env activate --dir ${SPACK_ENV} \ spack buildcache update-index eics3rw
&& spack add juggler@git.${JUGGLER_VERSION} \ spack env activate --dir ${SPACK_ENV}
&& spack add eicrecon@git.${EICRECON_VERSION} \ spack add juggler@git.${JUGGLER_VERSION}
&& make --jobs ${jobs} --keep-going --directory /opt/spack-environment \ spack add eicrecon@git.${EICRECON_VERSION}
SPACK_ENV=${SPACK_ENV} \ make --jobs ${jobs} --keep-going --directory /opt/spack-environment SPACK_ENV=${SPACK_ENV} BUILDCACHE_MIRROR="local eics3rw"
BUILDCACHE_MIRROR="local eics3rw" \ ccache --show-stats
&& ccache --show-stats \ ccache --zero-stats
&& ccache --zero-stats EOF
## Create view at /usr/local ## Create view at /usr/local
RUN --mount=type=cache,target=/var/cache/spack \ RUN --mount=type=cache,target=/var/cache/spack <<EOF
source $SPACK_ROOT/share/spack/setup-env.sh \ source $SPACK_ROOT/share/spack/setup-env.sh
&& spack env activate --dir ${SPACK_ENV} \ spack env activate --dir ${SPACK_ENV}
&& rm -r /usr/local \ rm -r /usr/local
&& spack env view enable /usr/local spack env view enable /usr/local
EOF
## Optional, nuke the buildcache after install, before (re)caching ## Optional, nuke the buildcache after install, before (re)caching
## This is useful when going to completely different containers, ## This is useful when going to completely different containers,
...@@ -156,10 +157,8 @@ RUN --mount=type=cache,target=/var/cache/spack,sharing=locked \ ...@@ -156,10 +157,8 @@ RUN --mount=type=cache,target=/var/cache/spack,sharing=locked \
[ -z "${CACHE_NUKE}" ] \ [ -z "${CACHE_NUKE}" ] \
|| rm -rf /var/cache/spack/mirror/${SPACK_VERSION}/build_cache/* || rm -rf /var/cache/spack/mirror/${SPACK_VERSION}/build_cache/*
## Including some small fixes ## Store environment
RUN echo "Grabbing environment info" \ RUN spack env activate --sh --dir ${SPACK_ENV} > /etc/profile.d/z10_spack_environment.sh
&& spack env activate --sh --dir ${SPACK_ENV} \
> /etc/profile.d/z10_spack_environment.sh
## make sure we have the entrypoints setup correctly ## make sure we have the entrypoints setup correctly
ENTRYPOINT [] ENTRYPOINT []
...@@ -182,15 +181,17 @@ RUN git -C $SPACK_ROOT gc --prune=all --aggressive ...@@ -182,15 +181,17 @@ RUN git -C $SPACK_ROOT gc --prune=all --aggressive
## See ## See
#https://askubuntu.com/questions/1034313/ubuntu-18-4-libqt5core-so-5-cannot-open-shared-object-file-no-such-file-or-dir #https://askubuntu.com/questions/1034313/ubuntu-18-4-libqt5core-so-5-cannot-open-shared-object-file-no-such-file-or-dir
## and links therin for more info ## and links therin for more info
RUN if [ -f /usr/local/lib/libQt5Core.so ] ; then \ RUN <<EOF
strip --remove-section=.note.ABI-tag /usr/local/lib/libQt5Core.so;\ if [ -f /usr/local/lib/libQt5Core.so ] ; then
fi strip --remove-section=.note.ABI-tag /usr/local/lib/libQt5Core.so
fi
EOF
RUN spack debug report \ RUN <<EOF
| sed "s/^/ - /" | sed "s/\* \*\*//" | sed "s/\*\*//" \ spack debug report | sed "s/^/ - /" | sed "s/\* \*\*//" | sed "s/\*\*//" >> /etc/jug_info
>> /etc/jug_info \ spack find --no-groups --long --variants | sed "s/^/ - /" >> /etc/jug_info
&& spack find --no-groups --long --variants | sed "s/^/ - /" >> /etc/jug_info \ spack graph --dot --installed > /opt/spack-environment/env.dot
&& spack graph --dot --installed > /opt/spack-environment/env.dot EOF
COPY eic-shell /usr/local/bin/eic-shell COPY eic-shell /usr/local/bin/eic-shell
...@@ -204,15 +205,14 @@ COPY singularity.d /.singularity.d ...@@ -204,15 +205,14 @@ COPY singularity.d /.singularity.d
## Add minio client into /usr/local/bin ## Add minio client into /usr/local/bin
ADD --chmod=0755 https://dl.min.io/client/mc/release/linux-amd64/mc /usr/local/bin/mc-amd64 ADD --chmod=0755 https://dl.min.io/client/mc/release/linux-amd64/mc /usr/local/bin/mc-amd64
ADD --chmod=0755 https://dl.min.io/client/mc/release/linux-arm64/mc /usr/local/bin/mc-arm64 ADD --chmod=0755 https://dl.min.io/client/mc/release/linux-arm64/mc /usr/local/bin/mc-arm64
RUN declare -A target=( \ RUN <<EOF
["linux/amd64"]="amd64" \ declare -A target=(["linux/amd64"]="amd64" ["linux/arm64"]="arm64")
["linux/arm64"]="arm64" \ mv /usr/local/bin/mc-${target[${TARGETPLATFORM}]} /usr/local/bin/mc
) \ unset target[${TARGETPLATFORM}]
&& mv /usr/local/bin/mc-${target[${TARGETPLATFORM}]} /usr/local/bin/mc \ for t in ${target[*]} ; do
&& unset target[${TARGETPLATFORM}] \ rm /usr/local/bin/mc-${t}
&& for t in ${target[*]} ; do \ done
rm /usr/local/bin/mc-${t} ; \ EOF
done
## ======================================================================================== ## ========================================================================================
## STAGE 3 ## STAGE 3
...@@ -236,27 +236,33 @@ COPY --from=staging /etc/eic-env.sh /etc/eic-env.sh ...@@ -236,27 +236,33 @@ COPY --from=staging /etc/eic-env.sh /etc/eic-env.sh
COPY --from=staging /.singularity.d /.singularity.d COPY --from=staging /.singularity.d /.singularity.d
## ensure /usr/local link is pointing to the right view ## ensure /usr/local link is pointing to the right view
RUN rm -rf /usr/local \ RUN <<EOF
&& PREFIX_PATH=$(realpath $(ls /usr/._local/ | tail -n1)) \ rm -rf /usr/local
&& echo "Found spack true prefix path to be $PREFIX_PATH" \ PREFIX_PATH=$(realpath $(ls /usr/._local/ | tail -n1))
&& ln -s /usr/._local/${PREFIX_PATH} /usr/local echo "Found spack true prefix path to be $PREFIX_PATH"
ln -s /usr/._local/${PREFIX_PATH} /usr/local
EOF
## set the local spack configuration ## set the local spack configuration
ENV SPACK_DISABLE_LOCAL_CONFIG="true" ENV SPACK_DISABLE_LOCAL_CONFIG="true"
RUN . /opt/spack/share/spack/setup-env.sh \ RUN <<EOF
&& spack config --scope site add "config:install_tree:root:~/spack" \ . /opt/spack/share/spack/setup-env.sh
&& spack config --scope site add "config:source_cache:~/.spack/cache" \ spack config --scope site add "config:install_tree:root:~/spack"
&& spack config --scope site add "config:binary_index_root:~/.spack" \ spack config --scope site add "config:source_cache:~/.spack/cache"
&& spack config --scope site add "config:environments_root:~/.spack/env" \ spack config --scope site add "config:binary_index_root:~/.spack"
&& spack config --scope site add "config:suppress_gpg_warnings:true" \ spack config --scope site add "config:environments_root:~/.spack/env"
&& spack config blame config \ spack config --scope site add "config:suppress_gpg_warnings:true"
&& spack config --scope site add "upstreams:eic-shell:install_tree:/opt/software" \ spack config blame config
&& spack config blame upstreams spack config --scope site add "upstreams:eic-shell:install_tree:/opt/software"
spack config blame upstreams
EOF
## set the jug_dev version and add the afterburner ## set the jug_dev version and add the afterburner
ARG JUG_VERSION=1 ARG JUG_VERSION=1
RUN echo "" >> /etc/jug_info \ RUN <<EOF
&& echo " - jug_dev: ${JUG_VERSION}" >> /etc/jug_info echo "" >> /etc/jug_info
echo " - jug_dev: ${JUG_VERSION}" >> /etc/jug_info
EOF
## eicweb shortcut ## eicweb shortcut
ARG EICWEB="https://eicweb.phy.anl.gov/api/v4/projects" ARG EICWEB="https://eicweb.phy.anl.gov/api/v4/projects"
...@@ -271,25 +277,17 @@ ADD ${EICWEB}/458/repository/tree?ref=${BENCHMARK_COM_VERSION} /tmp/485.json ...@@ -271,25 +277,17 @@ ADD ${EICWEB}/458/repository/tree?ref=${BENCHMARK_COM_VERSION} /tmp/485.json
ADD ${EICWEB}/399/repository/tree?ref=${BENCHMARK_DET_VERSION} /tmp/399.json ADD ${EICWEB}/399/repository/tree?ref=${BENCHMARK_DET_VERSION} /tmp/399.json
ADD ${EICWEB}/408/repository/tree?ref=${BENCHMARK_REC_VERSION} /tmp/408.json ADD ${EICWEB}/408/repository/tree?ref=${BENCHMARK_REC_VERSION} /tmp/408.json
ADD ${EICWEB}/400/repository/tree?ref=${BENCHMARK_PHY_VERSION} /tmp/400.json ADD ${EICWEB}/400/repository/tree?ref=${BENCHMARK_PHY_VERSION} /tmp/400.json
RUN mkdir -p /opt/benchmarks \ RUN <<EOF
&& cd /opt/benchmarks \ mkdir -p /opt/benchmarks
&& git clone -b ${BENCHMARK_COM_VERSION} --depth 1 \ cd /opt/benchmarks
https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git \ git clone -b ${BENCHMARK_COM_VERSION} --depth 1 https://eicweb.phy.anl.gov/EIC/benchmarks/common_bench.git
&& mkdir -p /opt/benchmarks \ git clone -b ${BENCHMARK_DET_VERSION} --depth 1 https://eicweb.phy.anl.gov/EIC/benchmarks/detector_benchmarks.git
&& cd /opt/benchmarks \ ln -sf ../common_bench detector_benchmarks/.local
&& git clone -b ${BENCHMARK_DET_VERSION} --depth 1 \ git clone -b ${BENCHMARK_REC_VERSION} --depth 1 https://eicweb.phy.anl.gov/EIC/benchmarks/reconstruction_benchmarks.git
https://eicweb.phy.anl.gov/EIC/benchmarks/detector_benchmarks.git \ ln -sf ../common_bench reconstruction_benchmarks/.local
&& ln -sf ../common_bench detector_benchmarks/.local \ git clone -b ${BENCHMARK_PHY_VERSION} --depth 1 https://eicweb.phy.anl.gov/EIC/benchmarks/physics_benchmarks.git
&& mkdir -p /opt/benchmarks \ ln -sf ../common_bench physics_benchmarks/.local
&& cd /opt/benchmarks \ EOF
&& git clone -b ${BENCHMARK_REC_VERSION} --depth 1 \
https://eicweb.phy.anl.gov/EIC/benchmarks/reconstruction_benchmarks.git \
&& ln -sf ../common_bench reconstruction_benchmarks/.local \
&& mkdir -p /opt/benchmarks \
&& cd /opt/benchmarks \
&& git clone -b ${BENCHMARK_PHY_VERSION} --depth 1 \
https://eicweb.phy.anl.gov/EIC/benchmarks/physics_benchmarks.git \
&& ln -sf ../common_bench physics_benchmarks/.local
## Install campaigns into the container ## Install campaigns into the container
ARG CAMPAIGNS_SINGLE_VERSION="main" ARG CAMPAIGNS_SINGLE_VERSION="main"
...@@ -301,22 +299,14 @@ ADD https://api.github.com/repos/eic/simulation_campaign_single/commits/${CAMPAI ...@@ -301,22 +299,14 @@ ADD https://api.github.com/repos/eic/simulation_campaign_single/commits/${CAMPAI
ADD https://api.github.com/repos/eic/simulation_campaign_hepmc3/commits/${CAMPAIGNS_HEPMC3_VERSION} /tmp/simulation_campaign_hepmc3.json ADD https://api.github.com/repos/eic/simulation_campaign_hepmc3/commits/${CAMPAIGNS_HEPMC3_VERSION} /tmp/simulation_campaign_hepmc3.json
ADD https://api.github.com/repos/eic/job_submission_condor/commits/${CAMPAIGNS_CONDOR_VERSION} /tmp/job_submission_condor.json ADD https://api.github.com/repos/eic/job_submission_condor/commits/${CAMPAIGNS_CONDOR_VERSION} /tmp/job_submission_condor.json
ADD https://api.github.com/repos/eic/job_submission_slurm/commits/${CAMPAIGNS_SLURM_VERSION} /tmp/job_submission_slurm.json ADD https://api.github.com/repos/eic/job_submission_slurm/commits/${CAMPAIGNS_SLURM_VERSION} /tmp/job_submission_slurm.json
RUN mkdir -p /opt/campaigns \ RUN <<EOF
&& cd /opt/campaigns \ mkdir -p /opt/campaigns
&& git clone -b ${CAMPAIGNS_SINGLE_VERSION} --depth 1 \ cd /opt/campaigns
https://github.com/eic/simulation_campaign_single.git single \ git clone -b ${CAMPAIGNS_SINGLE_VERSION} --depth 1 https://github.com/eic/simulation_campaign_single.git single
&& mkdir -p /opt/campaigns \ git clone -b ${CAMPAIGNS_HEPMC3_VERSION} --depth 1 https://github.com/eic/simulation_campaign_hepmc3.git hepmc3
&& cd /opt/campaigns \ git clone -b ${CAMPAIGNS_CONDOR_VERSION} --depth 1 https://github.com/eic/job_submission_condor.git condor
&& git clone -b ${CAMPAIGNS_HEPMC3_VERSION} --depth 1 \ git clone -b ${CAMPAIGNS_SLURM_VERSION} --depth 1 https://github.com/eic/job_submission_slurm.git slurm
https://github.com/eic/simulation_campaign_hepmc3.git hepmc3 \ EOF
&& mkdir -p /opt/campaigns \
&& cd /opt/campaigns \
&& git clone -b ${CAMPAIGNS_CONDOR_VERSION} --depth 1 \
https://github.com/eic/job_submission_condor.git condor \
&& mkdir -p /opt/campaigns \
&& cd /opt/campaigns \
&& git clone -b ${CAMPAIGNS_SLURM_VERSION} --depth 1 \
https://github.com/eic/job_submission_slurm.git slurm
## make sure we have the entrypoints setup correctly ## make sure we have the entrypoints setup correctly
ENTRYPOINT ["/usr/local/sbin/entrypoint.sh"] ENTRYPOINT ["/usr/local/sbin/entrypoint.sh"]
...@@ -327,8 +317,7 @@ SHELL ["/usr/local/bin/eic-shell"] ...@@ -327,8 +317,7 @@ SHELL ["/usr/local/bin/eic-shell"]
## eic-news ## eic-news
COPY --chmod=0755 eic-news /usr/local/bin/eic-news COPY --chmod=0755 eic-news /usr/local/bin/eic-news
RUN echo "test -f $HOME/.eic-news && source /usr/local/bin/eic-news" \ RUN echo "test -f $HOME/.eic-news && source /usr/local/bin/eic-news" > /etc/profile.d/z13_eic-news.sh
> /etc/profile.d/z13_eic-news.sh
## Hotfix for misbehaving OSG nodes ## Hotfix for misbehaving OSG nodes
RUN mkdir /hadoop RUN mkdir /hadoop
containers/jug/xl.Dockerfile
View file @ e92b8ce1
...@@ -17,8 +17,7 @@ ARG jobs=8 ...@@ -17,8 +17,7 @@ ARG jobs=8
## the date ## the date
ARG JUG_VERSION=1 ARG JUG_VERSION=1
RUN cd /tmp \ RUN echo " - jug_xl: ${JUG_VERSION}" >> /etc/jug_info
&& echo " - jug_xl: ${JUG_VERSION}" >> /etc/jug_info
## also install detector/ip geometries into opt ## also install detector/ip geometries into opt
ARG NIGHTLY='' ARG NIGHTLY=''
...@@ -31,11 +30,11 @@ ADD https://api.github.com/repos/eic/ip6 /tmp/ip6.json ...@@ -31,11 +30,11 @@ ADD https://api.github.com/repos/eic/ip6 /tmp/ip6.json
ADD https://api.github.com/repos/eic/epic /tmp/epic.json ADD https://api.github.com/repos/eic/epic /tmp/epic.json
COPY setup_detectors.py /tmp COPY setup_detectors.py /tmp
COPY --from=detectors detectors.yaml /tmp COPY --from=detectors detectors.yaml /tmp
RUN --mount=type=cache,target=/ccache/,sharing=locked,id=${TARGETPLATFORM} \ RUN --mount=type=cache,target=/ccache/,sharing=locked,id=${TARGETPLATFORM} <<EOF
cd /tmp \ cd /tmp
&& export CCACHE_DIR=/ccache \ export CCACHE_DIR=/ccache
&& [ "z$NIGHTLY" = "z1" ] && NIGHTLY_FLAG="--nightly" || NIGHTLY_FLAG="" \ [ "z$NIGHTLY" = "z1" ] && NIGHTLY_FLAG="--nightly" || NIGHTLY_FLAG=""
&& /tmp/setup_detectors.py --prefix /opt/detector --config /tmp/detectors.yaml \ /tmp/setup_detectors.py --prefix /opt/detector --config /tmp/detectors.yaml $NIGHTLY_FLAG
$NIGHTLY_FLAG \ ccache --show-stats
&& ccache --show-stats \ rm /tmp/setup_detectors.py
&& rm /tmp/setup_detectors.py EOF