diff --git a/Dockerfile b/Dockerfile index 574fcc44ffd72aeab58f0c3feb8f9ae79662f42e..a9c941f80e08962d62329b7dd268e77f5a44d3f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,9 +69,9 @@ RUN apt-get -qq update \ ############################################################################### # MAD-X installation (last releases) ############################################################################### -RUN wget http://madx.web.cern.ch/madx/releases/last-rel/madx-linux64-gnu \ - && mv madx-linux64-gnu /usr/bin/madx \ - && chmod +x /usr/bin/madx +#RUN wget http://madx.web.cern.ch/madx/releases/last-rel/madx-linux64-gnu \ +# && mv madx-linux64-gnu /usr/bin/madx \ +# && chmod +x /usr/bin/madx ############################################################################### # Install miniconda @@ -101,28 +101,28 @@ COPY environment.yml requirements.txt /tmp/ COPY postBuild.sh /usr/local/bin/postBuild.sh COPY entrypoint.sh /usr/local/bin/ -RUN chown $UID:$GID /tmp/environment.yml /tmp/requirements.txt \ - && chown $UID:$GID /usr/local/bin/postBuild.sh \ - && chmod u+x /usr/local/bin/postBuild.sh \ - && chown $UID:$GID /usr/local/bin/entrypoint.sh \ - && chmod u+x /usr/local/bin/entrypoint.sh +#RUN chown $UID:$GID /tmp/environment.yml /tmp/requirements.txt \ +# && chown $UID:$GID /usr/local/bin/postBuild.sh \ +# && chmod u+x /usr/local/bin/postBuild.sh \ +# && chown $UID:$GID /usr/local/bin/entrypoint.sh \ +# && chmod u+x /usr/local/bin/entrypoint.sh USER $USER -ENV MINICONDA_VERSION 4.7.12 -ENV CONDA_DIR $HOME/miniconda3 -ENV PATH=$CONDA_DIR/bin:$PATH - -RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-$MINICONDA_VERSION-Linux-x86_64.sh -O ~/miniconda.sh \ - && chmod +x ~/miniconda.sh \ - && ~/miniconda.sh -b -p $CONDA_DIR \ - && rm ~/miniconda.sh \ - # make conda activate command available from /bin/bash --login shells - && echo ". $CONDA_DIR/etc/profile.d/conda.sh" >> ~/.profile \ - # make conda activate command available from /bin/bash --interative shells - && conda init bash \ - # create a project directory inside user home - && mkdir $HOME/local_host_home +#ENV MINICONDA_VERSION 4.7.12 +#ENV CONDA_DIR $HOME/miniconda3 +#ENV PATH=$CONDA_DIR/bin:$PATH + +#RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-$MINICONDA_VERSION-Linux-x86_64.sh -O ~/miniconda.sh \ +# && chmod +x ~/miniconda.sh \ +# && ~/miniconda.sh -b -p $CONDA_DIR \ +# && rm ~/miniconda.sh \ +# # make conda activate command available from /bin/bash --login shells +# && echo ". $CONDA_DIR/etc/profile.d/conda.sh" >> ~/.profile \ +# # make conda activate command available from /bin/bash --interative shells +# && conda init bash \ +# # create a project directory inside user home +# && mkdir $HOME/local_host_home WORKDIR $HOME @@ -139,37 +139,37 @@ RUN conda update --name base --channel defaults conda \ ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 ENV PATH /opt/conda/bin:$PATH -RUN conda activate $ENV_PREFIX \ - && pip install -r /tmp/requirements.txt \ - && pip install pyNAFF \ - && git clone https://github.com/SixTrack/pysixtrack.git \ - && cd pysixtrack \ - && pip install -e . \ - && cd .. \ - && git clone https://github.com/SixTrack/sixtracktools.git \ - && cd sixtracktools \ - && pip install -e . \ - && cd .. \ - && git clone https://github.com/SixTrack/sixtracklib.git \ - && cd sixtracklib \ - && mkdir build \ - && cd build \ - && cmake .. \ - && make \ - && cd ../python \ - && pip install -e . \ - && cd ../.. \ - && git clone https://github.com/PyCOMPLETE/FillingPatterns.git \ - && pip install ./FillingPatterns \ - && python -m pip install -U --index-url https://acc-py-repo.cern.ch/repository/vr-py-releases/simple --trusted-host acc-py-repo.cern.ch pytimber \ - && python -m cmmnbuild_dep_manager resolve \ - && conda deactivate - - -COPY docker_start.sh $HOME/docker_start.sh -COPY run_sshuttle.sh $HOME/run_sshuttle.sh -COPY test_pytimber.py $HOME/test_pytimber.py -RUN echo "source /home/"$USER"/local_host_home/docker_start.sh" >> ~/.bashrc +#RUN conda activate $ENV_PREFIX \ +# && pip install -r /tmp/requirements.txt \ +# && pip install pyNAFF \ +# && git clone https://github.com/SixTrack/pysixtrack.git \ +# && cd pysixtrack \ +# && pip install -e . \ +# && cd .. \ +# && git clone https://github.com/SixTrack/sixtracktools.git \ +# && cd sixtracktools \ +# && pip install -e . \ +# && cd .. \ +# && git clone https://github.com/SixTrack/sixtracklib.git \ +# && cd sixtracklib \ +# && mkdir build \ +# && cd build \ +# && cmake .. \ +# && make \ +# && cd ../python \ +# && pip install -e . \ +# && cd ../.. \ +# && git clone https://github.com/PyCOMPLETE/FillingPatterns.git \ +# && pip install ./FillingPatterns \ +# && python -m pip install -U --index-url https://acc-py-repo.cern.ch/repository/vr-py-releases/simple --trusted-host acc-py-repo.cern.ch pytimber \ +# && python -m cmmnbuild_dep_manager resolve \ +# && conda deactivate + + +#COPY docker_start.sh $HOME/docker_start.sh +#COPY run_sshuttle.sh $HOME/run_sshuttle.sh +#COPY test_pytimber.py $HOME/test_pytimber.py +#RUN echo "source /home/"$USER"/local_host_home/docker_start.sh" >> ~/.bashrc USER $USER CMD ["/bin/bash" ]