From d2443896f71d8ead13a3082fa112478662d64bcf Mon Sep 17 00:00:00 2001
From: Bas Nijholt <basnijholt@gmail.com>
Date: Wed, 21 Aug 2019 16:02:50 +0200
Subject: [PATCH] python 3
---
Dockerfile | 38 ++++++++++++--------------------------
1 file changed, 12 insertions(+), 26 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 6a0af40..a95a058 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,42 +1,28 @@
-FROM ubuntu:xenial
+ubuntu:xenial
MAINTAINER Bas Nijholt <bas@nijho.lt>
ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
ENV PATH /opt/conda/bin:$PATH
-RUN apt-get update --fix-missing && apt-get install -y \
- wget \
- bzip2 \
- ca-certificates \
- libglib2.0-0 \
- libxext6 \
- libsm6 \
- libxrender1 \
- git \
- mercurial \
- subversion \
- #texlive-full \
- python-pygments\
- gnuplot \
- make \
- && rm -rf /var/lib/apt/lists/*
+RUN apt-get update --fix-missing && \
+ apt-get install -y wget bzip2 ca-certificates curl git && \
+ apt-get clean && \
+ rm -rf /var/lib/apt/lists/*
-RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda2-4.5.11-Linux-x86_64.sh -O ~/miniconda.sh && \
+RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-4.5.11-Linux-x86_64.sh -O ~/miniconda.sh && \
/bin/bash ~/miniconda.sh -b -p /opt/conda && \
rm ~/miniconda.sh && \
+ /opt/conda/bin/conda clean -tipsy && \
ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \
echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \
echo "conda activate base" >> ~/.bashrc
-RUN apt-get install -y curl grep sed dpkg && \
- TINI_VERSION=`curl https://github.com/krallin/tini/releases/latest | grep -o "/v.*\"" | sed 's:^..\(.*\).$:\1:'` && \
- curl -L "https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini_${TINI_VERSION}.deb" > tini.deb && \
- dpkg -i tini.deb && \
- rm tini.deb && \
- apt-get clean
+ENV TINI_VERSION v0.16.1
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini
+RUN chmod +x /usr/bin/tini
RUN apt-get update -q && apt-get install -qy \
- texlive-full \
+ # texlive-full \
python-pygments gnuplot \
make git \
&& rm -rf /var/lib/apt/lists/*
@@ -47,4 +33,4 @@ COPY environment.yml /environments/
RUN conda-env create -f /environments/environment.yml
ENTRYPOINT [ "/usr/bin/tini", "--" ]
-CMD [ "/bin/bash" ]
+CMD [ "/bin/bash" ]
\ No newline at end of file
--
GitLab