From 486d602f2d706b415d08efb3aa295b6404830b9d Mon Sep 17 00:00:00 2001
From: Chris Flerin <ccflerin@gmail.com>
Date: Mon, 18 Mar 2019 09:39:09 +0100
Subject: [PATCH] Container definitions: updated to 0.9.6, changed base images
 to python3.6.8-slim, streamlined install of build dependencies and cleanup.

---
 Dockerfile        | 16 ++++++++++------
 Singularity.0.9.6 | 12 ++++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 Singularity.0.9.6

diff --git a/Dockerfile b/Dockerfile
index ad4ef5c..d8e139b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,12 @@
-FROM continuumio/miniconda3
+FROM python:3.6.8-slim
 
-RUN apt-get update && apt-get install -y build-essential
-RUN conda create -n scenic python=3.6.7
-RUN echo "source activate scenic" > ~/.bashrc
-ENV PATH /opt/conda/envs/scenic/bin:$PATH
-RUN pip install --no-cache-dir --upgrade pyscenic dask==1.0.0 pandas==0.23.4
+RUN BUILDPKGS="build-essential apt-utils" && \
+    apt-get update && \
+    apt-get install -y $BUILDPKGS && \
+    apt-get install -y procps && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN pip install --no-cache-dir --upgrade pyscenic==0.9.6 dask==1.0.0 pandas==0.23.4
+
+RUN apt-get remove --purge -y $BUILDPKGS
 
diff --git a/Singularity.0.9.6 b/Singularity.0.9.6
new file mode 100644
index 0000000..774b861
--- /dev/null
+++ b/Singularity.0.9.6
@@ -0,0 +1,12 @@
+BootStrap: docker
+From: python:3.6.8-slim
+
+%post
+    BUILDPKGS="build-essential apt-utils" && \
+    apt-get update && \
+    apt-get install -y $BUILDPKGS && \
+    apt-get install -y procps && \
+    rm -rf /var/lib/apt/lists/*
+    pip install --no-cache-dir --upgrade pyscenic==0.9.6 dask==1.0.0 pandas==0.23.4
+    apt-get remove --purge -y $BUILDPKGS
+