Skip to content

Commit bfc02c5

Browse files
Merge pull request #203 from mwestphall/SOFTWARE-6140-apptainer-1.4.2
SOFTWARE-6140: Use epel-provided apptainer 1.4.2
2 parents 790cd80 + d1430f3 commit bfc02c5

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ ARG BASE_OSG_SERIES
2020
ARG BASE_OS
2121
ARG BASE_YUM_REPO
2222
ARG TIMESTAMP_IMAGE=osgvo-docker-pilot:${BASE_OSG_SERIES}-${BASE_OS}-${BASE_YUM_REPO}-$(date +%Y%m%d-%H%M)
23-
ARG LOCAL_APPTAINER_VERSION=1.3.6
2423

2524
RUN useradd osg \
2625
&& mkdir -p ~osg/.condor \
@@ -56,11 +55,6 @@ RUN if [[ $BASE_YUM_REPO = release ]]; then \
5655
fi; \
5756
fi
5857

59-
# Install an alternate back-version of apptainer with support for registry mirrors,
60-
# which was broken in the 1.4 release https://github.com/apptainer/apptainer/issues/2919
61-
RUN curl -s https://raw.githubusercontent.com/apptainer/apptainer/main/tools/install-unprivileged.sh | \
62-
bash -s - -d $(cat /etc/os-release | grep PLATFORM | grep -o 'el[0-9]\+') -v ${LOCAL_APPTAINER_VERSION} /usr/local/
63-
6458

6559
# Make a /proc dir in the sandbox condor uses to test singularity so we can test proc bind mounting
6660
# Workaround for https://opensciencegrid.atlassian.net/browse/HTCONDOR-1574

0 commit comments

Comments
 (0)