From 1a6bfef636b90f4c9ee9b655fc0a30a3c01c1710 Mon Sep 17 00:00:00 2001
From: qifei <qifei9@gmail.com>
Date: Mon, 29 Mar 2021 19:32:38 +0800
Subject: [PATCH] Fix hpcng/singularity#5144 and apt-get problem

---
 Dockerfile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9856fd9..c1b46e3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,13 +14,15 @@ ENV GALAXY_CONFIG_TOOL_CONFIG_FILE=config/tool_conf.xml.sample,config/shed_tool_
 ENV GALAXY_DOCKER_ENABLED=True
 
 ## Install environment modules & singularity
-RUN apt-get update --fix-missing \
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+    && mv /etc/apt/sources.list.d/htcondor.list* /tmp \
+    && apt-get update \
     && apt-get install -y wget libssl-dev libssl1.0.0 \
-    && sudo apt-get update \
+    && apt-get update \
     && apt-get install -y environment-modules squashfs-tools libtool libarchive-dev \
-    && git clone https://github.com/singularityware/singularity.git \
+    && mv /tmp/htcondor.list* /etc/apt/sources.list.d/ \
+    && git clone https://github.com/lyklev/singularity \
     && cd singularity \
-    && git checkout 2.6.0 \
     && ./autogen.sh \
     && ./configure --prefix=/usr/local \
     && make \