From 3eec403a6ff663eddcb87b8f675946ae7cd6679d Mon Sep 17 00:00:00 2001 From: lrouhier Date: Wed, 15 Jan 2020 16:08:53 -0500 Subject: [PATCH 1/5] change version in command line --- README.rst | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/README.rst b/README.rst index 2f79d0c..3b4ba4d 100644 --- a/README.rst +++ b/README.rst @@ -76,7 +76,7 @@ Installation .. code:: sh - docker pull neuropoly/sct:sct-4.0.0-official + docker pull neuropoly/sct:sct-4.2.1-official Note: to list all available images on the registery, please see `Generation and distribution`_. @@ -87,7 +87,7 @@ Installation .. code:: sh - docker load --input sct-4.0.0-official.tar + docker load --input sct-4.2.1-official.tar **Note:** After the --input parameter you can include the complete path where the docker image is located. @@ -140,13 +140,13 @@ Usage .. code:: sh - docker run -p 2222:22 --rm -it -v c:/Users/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-4.0.0-official + docker run -p 2222:22 --rm -it -v c:/Users/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-4.2.1-official - If running Docker Toolbox, open Docker Quickstart Terminal, wait until get a prompt and write: .. code:: sh - docker run -p 2222:22 --rm -it -v //c/Users/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-4.0.0-official + docker run -p 2222:22 --rm -it -v //c/Users/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-4.2.1-official **Note:** The folder ``C:/Users/docker_shared_folder`` on the Windows host system will be linked to the folder @@ -254,7 +254,7 @@ Usage .. code:: sh - docker run -p 2222:22 --rm -it -v /home/docker/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-4.0.0-official + docker run -p 2222:22 --rm -it -v /home/docker/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-4.2.1-official - Check if the Docker shared folder is highlighted in green: @@ -357,13 +357,13 @@ Installation .. code:: sh - docker pull neuropoly/sct:sct-4.0.0-official + docker pull neuropoly/sct:sct-4.2.1-official - Else, load the SCT image from a local file .. code:: sh - docker load --input sct-4.0.0-official.tar + docker load --input sct-4.2.1-official.tar #. If you are on OSX and you need X forwarding (e.g. to run FSLeyes from the ssh window), install `Xquartz `_. After installing Xquartz and after rebooting, run this command to prevent `this issue `_: @@ -388,7 +388,7 @@ Usage .. code:: sh - docker run -p 2222:22 --rm -it -v ~/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-4.0.0-official + docker run -p 2222:22 --rm -it -v ~/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-4.2.1-official #. (NOT MANDATORY) Change the password (default is `sct`) from the container prompt: @@ -419,13 +419,13 @@ Usage .. code:: sh cd $HOME - tar xf /path/to/sct-4.0.0-official-offline.tar.xz + tar xf /path/to/sct-4.2.1-official-offline.tar.xz #. Add PATH: .. code:: sh - PATH+=":/home/sct/sct_4.0.0/bin" + PATH+=":/home/sct/sct_4.2.1/bin" #. Use it! @@ -468,20 +468,20 @@ Example: creation of all distros container images: .. code:: sh - ./sct_docker_images.py generate --version 4.0.0 + ./sct_docker_images.py generate --version 4.2.1 Example: creation of offline archive tarball: .. code:: sh - ./sct_docker_images.py generate --version 4.0.0 --distros ubuntu:18.04 --generate-distro-specific-sct-tarball + ./sct_docker_images.py generate --version 4.2.1 --distros ubuntu:18.04 --generate-distro-specific-sct-tarball Example: creation and distribution: .. code:: sh docker login # Make sure your account has push permission on neuropoly organization - ./sct_docker_images.py generate --version 4.0.0 --publish-under neuropoly/sct + ./sct_docker_images.py generate --version 4.2.1 --publish-under neuropoly/sct Notes From 6b18399e1892e93036d314d626354f51607745e1 Mon Sep 17 00:00:00 2001 From: lrouhier Date: Wed, 15 Jan 2020 16:16:55 -0500 Subject: [PATCH 2/5] Replaced 4.2.1 by latest in useful command --- README.rst | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.rst b/README.rst index 3b4ba4d..88bfe58 100644 --- a/README.rst +++ b/README.rst @@ -76,7 +76,7 @@ Installation .. code:: sh - docker pull neuropoly/sct:sct-4.2.1-official + docker pull neuropoly/sct:sct-latest Note: to list all available images on the registery, please see `Generation and distribution`_. @@ -87,7 +87,7 @@ Installation .. code:: sh - docker load --input sct-4.2.1-official.tar + docker load --input sct-latest.tar **Note:** After the --input parameter you can include the complete path where the docker image is located. @@ -140,13 +140,13 @@ Usage .. code:: sh - docker run -p 2222:22 --rm -it -v c:/Users/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-4.2.1-official + docker run -p 2222:22 --rm -it -v c:/Users/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-latest - If running Docker Toolbox, open Docker Quickstart Terminal, wait until get a prompt and write: .. code:: sh - docker run -p 2222:22 --rm -it -v //c/Users/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-4.2.1-official + docker run -p 2222:22 --rm -it -v //c/Users/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-latest **Note:** The folder ``C:/Users/docker_shared_folder`` on the Windows host system will be linked to the folder @@ -254,7 +254,7 @@ Usage .. code:: sh - docker run -p 2222:22 --rm -it -v /home/docker/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-4.2.1-official + docker run -p 2222:22 --rm -it -v /home/docker/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-latest - Check if the Docker shared folder is highlighted in green: @@ -357,13 +357,13 @@ Installation .. code:: sh - docker pull neuropoly/sct:sct-4.2.1-official + docker pull neuropoly/sct:sct-latest - Else, load the SCT image from a local file .. code:: sh - docker load --input sct-4.2.1-official.tar + docker load --input sct-latest #. If you are on OSX and you need X forwarding (e.g. to run FSLeyes from the ssh window), install `Xquartz `_. After installing Xquartz and after rebooting, run this command to prevent `this issue `_: @@ -388,7 +388,7 @@ Usage .. code:: sh - docker run -p 2222:22 --rm -it -v ~/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-4.2.1-official + docker run -p 2222:22 --rm -it -v ~/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-latest #. (NOT MANDATORY) Change the password (default is `sct`) from the container prompt: @@ -419,13 +419,13 @@ Usage .. code:: sh cd $HOME - tar xf /path/to/sct-4.2.1-official-offline.tar.xz + tar xf /path/to/sct-latest-official-offline.tar.xz #. Add PATH: .. code:: sh - PATH+=":/home/sct/sct_4.2.1/bin" + PATH+=":/home/sct/sct_latest/bin" #. Use it! @@ -464,7 +464,7 @@ List all available images in the registery (you will need `wget` for this to wor wget -q https://registry.hub.docker.com/v1/repositories/neuropoly/sct/tags -O - | sed -e 's/[][]//g' -e 's/"//g' -e 's/ //g' | tr '}' '\n' | awk -F: '{print $3}' -Example: creation of all distros container images: +Example: creation of all distros container images for a specific version: .. code:: sh From 18002d6d94c340bc5e8031d07232badc30a3663d Mon Sep 17 00:00:00 2001 From: lrouhier Date: Wed, 15 Jan 2020 16:26:42 -0500 Subject: [PATCH 3/5] change tag --- README.rst | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.rst b/README.rst index 88bfe58..1b157d8 100644 --- a/README.rst +++ b/README.rst @@ -76,7 +76,7 @@ Installation .. code:: sh - docker pull neuropoly/sct:sct-latest + docker pull neuropoly/sct:latest Note: to list all available images on the registery, please see `Generation and distribution`_. @@ -87,7 +87,7 @@ Installation .. code:: sh - docker load --input sct-latest.tar + docker load --input latest.tar **Note:** After the --input parameter you can include the complete path where the docker image is located. @@ -140,13 +140,13 @@ Usage .. code:: sh - docker run -p 2222:22 --rm -it -v c:/Users/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-latest + docker run -p 2222:22 --rm -it -v c:/Users/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:latest - If running Docker Toolbox, open Docker Quickstart Terminal, wait until get a prompt and write: .. code:: sh - docker run -p 2222:22 --rm -it -v //c/Users/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-latest + docker run -p 2222:22 --rm -it -v //c/Users/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:latest **Note:** The folder ``C:/Users/docker_shared_folder`` on the Windows host system will be linked to the folder @@ -254,7 +254,7 @@ Usage .. code:: sh - docker run -p 2222:22 --rm -it -v /home/docker/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-latest + docker run -p 2222:22 --rm -it -v /home/docker/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:latest - Check if the Docker shared folder is highlighted in green: @@ -357,13 +357,13 @@ Installation .. code:: sh - docker pull neuropoly/sct:sct-latest + docker pull neuropoly/sct:latest - Else, load the SCT image from a local file .. code:: sh - docker load --input sct-latest + docker load --input latest #. If you are on OSX and you need X forwarding (e.g. to run FSLeyes from the ssh window), install `Xquartz `_. After installing Xquartz and after rebooting, run this command to prevent `this issue `_: @@ -388,7 +388,7 @@ Usage .. code:: sh - docker run -p 2222:22 --rm -it -v ~/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:sct-latest + docker run -p 2222:22 --rm -it -v ~/docker_shared_folder://home/sct/docker_shared_folder neuropoly/sct:latest #. (NOT MANDATORY) Change the password (default is `sct`) from the container prompt: @@ -419,13 +419,13 @@ Usage .. code:: sh cd $HOME - tar xf /path/to/sct-latest-official-offline.tar.xz + tar xf /path/to/latest-official-offline.tar.xz #. Add PATH: .. code:: sh - PATH+=":/home/sct/sct_latest/bin" + PATH+=":/home/sct/latest/bin" #. Use it! From f02852269736ed385de1e401c9d80b53293bcf23 Mon Sep 17 00:00:00 2001 From: lrouhier Date: Wed, 15 Jan 2020 16:29:40 -0500 Subject: [PATCH 4/5] tag forgotten --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 1b157d8..535a3a0 100644 --- a/README.rst +++ b/README.rst @@ -419,7 +419,7 @@ Usage .. code:: sh cd $HOME - tar xf /path/to/latest-official-offline.tar.xz + tar xf /path/to/latest.tar.xz #. Add PATH: From 984d0ccee12f6b3ef62f84eae7f2605785d28493 Mon Sep 17 00:00:00 2001 From: lrouhier Date: Wed, 15 Jan 2020 17:10:42 -0500 Subject: [PATCH 5/5] offline instruction modification --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 535a3a0..293075f 100644 --- a/README.rst +++ b/README.rst @@ -363,7 +363,7 @@ Installation .. code:: sh - docker load --input latest + docker load --input latest-offline.tar #. If you are on OSX and you need X forwarding (e.g. to run FSLeyes from the ssh window), install `Xquartz `_. After installing Xquartz and after rebooting, run this command to prevent `this issue `_: