From 1e46bee51338d068862360c19ac805ad8a0739fd Mon Sep 17 00:00:00 2001
From: Remi Perenon <perenon@ill.eu>
Date: Mon, 4 Sep 2023 15:10:35 +0200
Subject: [PATCH] Update mantid-daily.def

---
 mantid-daily.def | 63 +++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 54 insertions(+), 9 deletions(-)

diff --git a/mantid-daily.def b/mantid-daily.def
index bebfdc1..e94c807 100644
--- a/mantid-daily.def
+++ b/mantid-daily.def
@@ -1,5 +1,5 @@
 Bootstrap: docker
-From: continuumio/miniconda3
+From: ubuntu:22.04
 
 %help        
   mantid daily container
@@ -8,9 +8,58 @@ From: continuumio/miniconda3
   Author Eric Pellegrini & Remi Perenon
   Version v0.0.1
 
-%post
-  apt update -y
+%post -c /bin/bash
+
+  LANG=C.UTF-8 LC_ALL=C.UTF-8
+
+  apt-get update -q && \
+  apt-get install -q -y --no-install-recommends \
+        bzip2 \
+        ca-certificates \
+        git \
+        libglib2.0-0 \
+        libsm6 \
+        libxext6 \
+        libxrender1 \
+        mercurial \
+        openssh-client \
+        procps \
+        subversion \
+        wget \
+        libc-bin \
+        binutils \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+#apt-get update && apt-get -y upgrade
+#apt-get -y install \
+#build-essential \
+#wget \
+#bzip2 \
+#ca-certificates \
+#libglib2.0-0 \
+#libxext6 \
+#libsm6 \
+#libxrender1 \
+#git
+#rm -rf /var/lib/apt/lists/*
+#apt-get clean
+
+  #Installing Anaconda 3
+  wget -c "https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh"
+  /bin/bash Miniconda3-latest-Linux-x86_64.sh -bfp /opt/conda
+  PATH=/opt/conda/bin:${PATH}
+  #Conda configuration of channels from .condarc file
+  conda config --file /.condarc --add channels defaults
+  conda config --file /.condarc --add channels conda-forge
+
+  conda init bash
+  chmod ugo+x /opt/conda/etc/profile.d/conda.sh
+  source /opt/conda/etc/profile.d/conda.sh
+  
+  apt update -y && \
   apt install -y libglu1 \
+                 libgl1-mesa-glx \
                  libxcomposite-dev \
                  libxcursor-dev \
                  libxi-dev \
@@ -19,12 +68,8 @@ From: continuumio/miniconda3
                  libpci-dev \
                  libxrandr2
                  
-  conda create -n mantid-singularity
-  
-  conda init bash
-  
-  . /root/.bashrc
-    
+  conda create -n mantid-singularity python=3.8
+
   conda activate mantid-singularity
   
   export no_proxy=cs.ill.fr
-- 
GitLab