Add more static URLs for Singularity debs (DataBiosphere#4007)

douglowe · Jan 18, 2022 · 0e256d6 · 0e256d6
1 parent a828340
commit 0e256d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/docker/Dockerfile.py b/docker/Dockerfile.py
@@ -103,10 +103,11 @@ def heredoc(s):
         apt-get clean && \
         rm -rf /var/lib/apt/lists/*
 
-    # Install Singularity from a newer Debian.
+    # Install a particular old Debian Sid Singularity from somewhere.
     # The dependencies it thinks it needs aren't really needed and aren't
     # available here.
-    RUN wget https://debian.osuosl.org/debian/pool/main/s/singularity-container/$(curl -sSL 'https://debian.osuosl.org/debian/pool/main/s/singularity-container/' | grep -o "singularity-container_3[^\\"]*$(if [ $TARGETARCH = amd64 ] ; then echo amd64 ; else echo arm64 ; fi).deb" | head -n1) && \
+    ADD singularity-sources.tsv /etc/singularity/singularity-sources.tsv
+    RUN wget "$(cat /etc/singularity/singularity-sources.tsv | grep "^$TARGETARCH" | cut -f3)" && \
         (dpkg -i singularity-container_3*.deb || true) && \
         dpkg --force-depends --configure -a && \
         sed -i 's/containernetworking-plugins, //' /var/lib/dpkg/status && \

diff --git a/docker/singularity-sources.tsv b/docker/singularity-sources.tsv
@@ -0,0 +1,3 @@
+#Architecture	SHA1	URL	URL	...
+amd64	fc019f0df2ca7a3a05c569a7a33bdd615be5d7fa	https://snapshot.debian.org/archive/debian/20191218T025705Z/pool/main/s/singularity-container/singularity-container_3.5.2%2Bds1-1_amd64.deb	https://ipfs.io/ipfs/QmecZcGG7VFHABhRQvy1cP168V9zhan1E9gcUD6jsmpWsT/singularity-container_3.5.2%2Bds1-1_amd64.deb
+arm64	6a82f8e640fcafcb2030f0bcbae7c89a4dc150f9	https://snapshot.debian.org/archive/debian/20191218T085528Z/pool/main/s/singularity-container/singularity-container_3.5.2%2Bds1-1_arm64.deb	https://ipfs.io/ipfs/QmT8NMXU2kzs2sBAc2HbGXjwTRXqLYBawRgx3fcFWxccMB/singularity-container_3.5.2%2Bds1-1_arm64.deb