Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions dockerfiles/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/*
Expand All @@ -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.
Expand All @@ -82,5 +79,3 @@ RUN cd $HOME && \
python setup.py install

USER PyGeM


17 changes: 0 additions & 17 deletions dockerfiles/set-home-permissions.sh

This file was deleted.