From 139bf0cf7ed7ec06b97c377f7340118b31c12102 Mon Sep 17 00:00:00 2001 From: Regression testing Date: Wed, 6 Sep 2023 05:09:20 -0400 Subject: [PATCH 1/3] add comment within README.rst regarding dyna executables. Add chmod line in do_build to give required rights before creating docker image --- docker/solver/README.rst | 6 +++++- docker/solver/do_build | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docker/solver/README.rst b/docker/solver/README.rst index 770da9466..1912a082a 100644 --- a/docker/solver/README.rst +++ b/docker/solver/README.rst @@ -35,6 +35,10 @@ Prerequisites >>> Dockerfile README.rst do_build docker-compose.yml docker_dir mpi mppdyna_docker_centos7.zip +* Within docker_dir, there is a file called mppdyna. This file is the executable to run. It can be + any executable (SMP, MPP) or revision and branch. To run a given file, the name shall be changed to + mppdyna and copied inside docker_dir. + Once all prerequisites are met, you can build the Docker image for the ``solver`` service. Build the Docker image @@ -101,4 +105,4 @@ To copy files back from the ``solver`` container to your host machine use the co docker cp :/file/path/within/container /host/target/path -The path within the container is ``/rundir``. \ No newline at end of file +The path within the container is ``/rundir``. diff --git a/docker/solver/do_build b/docker/solver/do_build index 99df1bdb9..adfa4078a 100644 --- a/docker/solver/do_build +++ b/docker/solver/do_build @@ -8,6 +8,8 @@ ssh-keygen -q -b 2048 -f ssh/id_rsa -N "" echo "Host *" > ssh/config echo " StrictHostKeyChecking no" >> ssh/config # +chmod -R 755 * +# # Build container # docker build -t dyna_solver_v04 . From c38263106305553088d96dabfe29de4f6d824961 Mon Sep 17 00:00:00 2001 From: Fabian de Leon Mazariegos Date: Wed, 6 Sep 2023 05:55:01 -0400 Subject: [PATCH 2/3] Revert "add comment within README.rst regarding dyna executables. Add chmod line in do_build to give required rights before creating docker image" This reverts commit 139bf0cf7ed7ec06b97c377f7340118b31c12102. --- docker/solver/README.rst | 6 +----- docker/solver/do_build | 2 -- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/docker/solver/README.rst b/docker/solver/README.rst index 1912a082a..770da9466 100644 --- a/docker/solver/README.rst +++ b/docker/solver/README.rst @@ -35,10 +35,6 @@ Prerequisites >>> Dockerfile README.rst do_build docker-compose.yml docker_dir mpi mppdyna_docker_centos7.zip -* Within docker_dir, there is a file called mppdyna. This file is the executable to run. It can be - any executable (SMP, MPP) or revision and branch. To run a given file, the name shall be changed to - mppdyna and copied inside docker_dir. - Once all prerequisites are met, you can build the Docker image for the ``solver`` service. Build the Docker image @@ -105,4 +101,4 @@ To copy files back from the ``solver`` container to your host machine use the co docker cp :/file/path/within/container /host/target/path -The path within the container is ``/rundir``. +The path within the container is ``/rundir``. \ No newline at end of file diff --git a/docker/solver/do_build b/docker/solver/do_build index adfa4078a..99df1bdb9 100644 --- a/docker/solver/do_build +++ b/docker/solver/do_build @@ -8,8 +8,6 @@ ssh-keygen -q -b 2048 -f ssh/id_rsa -N "" echo "Host *" > ssh/config echo " StrictHostKeyChecking no" >> ssh/config # -chmod -R 755 * -# # Build container # docker build -t dyna_solver_v04 . From e5459ef82fd7968e5d9774a537b83fb019bab38b Mon Sep 17 00:00:00 2001 From: Fabian de Leon Mazariegos Date: Wed, 6 Sep 2023 05:56:42 -0400 Subject: [PATCH 3/3] add comment within README.rst regarding dyna executables. Add chmod line in do_build to give required rights before creating docker image --- docker/solver/README.rst | 6 +++++- docker/solver/do_build | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docker/solver/README.rst b/docker/solver/README.rst index 770da9466..1912a082a 100644 --- a/docker/solver/README.rst +++ b/docker/solver/README.rst @@ -35,6 +35,10 @@ Prerequisites >>> Dockerfile README.rst do_build docker-compose.yml docker_dir mpi mppdyna_docker_centos7.zip +* Within docker_dir, there is a file called mppdyna. This file is the executable to run. It can be + any executable (SMP, MPP) or revision and branch. To run a given file, the name shall be changed to + mppdyna and copied inside docker_dir. + Once all prerequisites are met, you can build the Docker image for the ``solver`` service. Build the Docker image @@ -101,4 +105,4 @@ To copy files back from the ``solver`` container to your host machine use the co docker cp :/file/path/within/container /host/target/path -The path within the container is ``/rundir``. \ No newline at end of file +The path within the container is ``/rundir``. diff --git a/docker/solver/do_build b/docker/solver/do_build index 99df1bdb9..adfa4078a 100644 --- a/docker/solver/do_build +++ b/docker/solver/do_build @@ -8,6 +8,8 @@ ssh-keygen -q -b 2048 -f ssh/id_rsa -N "" echo "Host *" > ssh/config echo " StrictHostKeyChecking no" >> ssh/config # +chmod -R 755 * +# # Build container # docker build -t dyna_solver_v04 .