From edd632c688007aa4917ef6c38632c005cc5af77a Mon Sep 17 00:00:00 2001 From: Jan Malec Date: Fri, 26 Apr 2019 09:46:49 +0200 Subject: [PATCH 1/3] Added a Docker file for the develop branch. --- Dockerfile/Dockerfile | 10 ++++++++++ Dockerfile/dockerfile-build-instructions.txt | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 Dockerfile/Dockerfile create mode 100644 Dockerfile/dockerfile-build-instructions.txt diff --git a/Dockerfile/Dockerfile b/Dockerfile/Dockerfile new file mode 100644 index 00000000..0f1977da --- /dev/null +++ b/Dockerfile/Dockerfile @@ -0,0 +1,10 @@ +FROM ubuntu:18.04 +MAINTAINER Jan Malec (jan.malec@gmail.com) + +RUN apt update +RUN apt install -y gfortran python3 python3-setuptools\ + python3-numpy python3-dev unzip ca-certificates + +COPY sandy-develop.zip / +RUN unzip sandy-develop.zip +RUN cd sandy-develop && python3 setup.py install diff --git a/Dockerfile/dockerfile-build-instructions.txt b/Dockerfile/dockerfile-build-instructions.txt new file mode 100644 index 00000000..f0596992 --- /dev/null +++ b/Dockerfile/dockerfile-build-instructions.txt @@ -0,0 +1,2 @@ +Place sandy-develop.zip in the same folder as the Dockerfile and run +"docker build -t "sandy:develop" . From 76260587584cceb0f92cb3d49a93d46b259f926d Mon Sep 17 00:00:00 2001 From: malec Date: Mon, 24 Jun 2019 15:15:02 +0200 Subject: [PATCH 2/3] Updated Dockerfile to clone Sandy from git. --- Dockerfile/Dockerfile | 7 +++---- Dockerfile/dockerfile-build-instructions.txt | 7 +++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile/Dockerfile b/Dockerfile/Dockerfile index 0f1977da..2a107614 100644 --- a/Dockerfile/Dockerfile +++ b/Dockerfile/Dockerfile @@ -3,8 +3,7 @@ MAINTAINER Jan Malec (jan.malec@gmail.com) RUN apt update RUN apt install -y gfortran python3 python3-setuptools\ - python3-numpy python3-dev unzip ca-certificates + python3-numpy python3-dev unzip ca-certificates git -COPY sandy-develop.zip / -RUN unzip sandy-develop.zip -RUN cd sandy-develop && python3 setup.py install +RUN git clone https://github.com/janmalec/sandy.git +RUN cd sandy && python3 setup.py install diff --git a/Dockerfile/dockerfile-build-instructions.txt b/Dockerfile/dockerfile-build-instructions.txt index f0596992..ca7c4efc 100644 --- a/Dockerfile/dockerfile-build-instructions.txt +++ b/Dockerfile/dockerfile-build-instructions.txt @@ -1,2 +1,5 @@ -Place sandy-develop.zip in the same folder as the Dockerfile and run -"docker build -t "sandy:develop" . +Run "docker build -t "sandy:develop" . +in the directory with the Dockerfile. + +You can create a container by running +"docker run -it sandy:develop". From c582c312abf2cf6c7f38b5a8f2c05a5cebfa7d4f Mon Sep 17 00:00:00 2001 From: janmalec Date: Mon, 24 Jun 2019 15:19:17 +0200 Subject: [PATCH 3/3] Changed the URL for git clone in Dockerfile --- Dockerfile/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile/Dockerfile b/Dockerfile/Dockerfile index 2a107614..829e8578 100644 --- a/Dockerfile/Dockerfile +++ b/Dockerfile/Dockerfile @@ -5,5 +5,5 @@ RUN apt update RUN apt install -y gfortran python3 python3-setuptools\ python3-numpy python3-dev unzip ca-certificates git -RUN git clone https://github.com/janmalec/sandy.git +RUN git clone https://github.com/luca-fiorito-11/sandy.git RUN cd sandy && python3 setup.py install