diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index f67b9c9..876dcda 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -25,9 +25,6 @@ RUN useradd -m -s /bin/bash -G sudo,docker_env PyGeM && \ echo "PyGeM:docker" | chpasswd && \ echo "PyGeM ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -RUN touch /etc/service/syslog-forwarder/down -COPY set-home-permissions.sh /etc/my_init.d/set-home-permissions.sh -RUN chmod +x /etc/my_init.d/set-home-permissions.sh USER PyGeM ENV HOME /home/PyGeM @@ -50,7 +47,7 @@ RUN id PyGeM RUN chown -R PyGeM:PyGeM $HOME RUN cd /tmp && \ - wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh && \ + wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh && \ chmod +x miniconda.sh && \ bash miniconda.sh -b -p /usr/local/miniconda && \ rm /tmp/* @@ -63,7 +60,7 @@ RUN hash -r && \ conda config --set always_yes yes --set changeps1 no && \ conda update -q conda RUN conda info -a && \ - conda create --yes -n test python="2.7"; + conda create --yes -n test python="3.7"; RUN /bin/bash -c 'source activate test' # The default sip version has api that is not compatible with qt4. @@ -82,5 +79,3 @@ RUN cd $HOME && \ python setup.py install USER PyGeM - - diff --git a/dockerfiles/set-home-permissions.sh b/dockerfiles/set-home-permissions.sh deleted file mode 100644 index 7e3c6d8..0000000 --- a/dockerfiles/set-home-permissions.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# User can pass e.g. --env HOST_UID=1003 so that UID in the container matches -# with the UID on the host. This is useful for Linux users, Mac and Windows -# already do transparent mapping of shared volumes. -if [ "$HOST_UID" ]; then - usermod -u $HOST_UID PyGeM -fi -if [ "$HOST_GID" ]; then - groupmod -g $HOST_GID PyGeM -fi -# This makes sure that all files in /home/fenics are accessible by the user -# fenics. We exclude the folder ~/shared to reduce IO out to the host. Docker -# for Mac, Docker for Windows and the UID/GID trick above should mean that file -# permissions work seamlessly now. -cd /home/PyGeM -find . -maxdepth 1 | grep -v "./shared" | xargs chown -R PyGeM:PyGeM -