updates

radiant-rstats · Aug 13, 2024 · cad0bf5 · cad0bf5
1 parent f15e2ba
commit cad0bf5
Show file tree

Hide file tree

Showing 10 changed files with 344 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -21,14 +21,14 @@ Docker version 20.10.13, build a224086
 
 * For detailed install instructions on Windows (Intel) see [install/rsm-msba-windows.md](install/rsm-msba-windows.md)
 * For detailed install instructions on Windows (ARM) see [install/rsm-msba-windows-arm.md](install/rsm-msba-windows-arm.md)
-* For detailed install instructions on macOS (M1, M2, or M3) see [install/rsm-msba-macos-m1.md](install/rsm-msba-macos-m1.md)
+* For detailed install instructions on macOS (M1, M2, M3, etc.) see [install/rsm-msba-macos-arm.md](install/rsm-msba-macos-arm.md)
 * For detailed install instructions on macOS (Intel) see [install/rsm-msba-macos.md](install/rsm-msba-macos.md)
 * For detailed install instructions on Linux see [install/rsm-msba-linux.md](install/rsm-msba-linux.md)
 * For detailed install instructions on ChromeOS see [install/rsm-msba-chromeos.md](install/rsm-msba-chromeos.md)
 
 ## rsm-msba-arm and rsm-msba-intel
 
-`rsm-msba-arm` is built for M1, ARM based macOS computers. `rsm-msba-intel` is built for AMD based computers and includes Rstudio Server. To build a new image based on `rsm-jupter-rs` add the following at the top of your Dockerfile
+`rsm-msba-arm` is built for M1, M2, etc., ARM based macOS computers. `rsm-msba-intel` is built for AMD based computers and includes Rstudio Server. To build a new image based on `rsm-msba_intel` add the following at the top of your Dockerfile
 
 ```
 FROM vnijs/rsm-msba-intel:latest
@@ -92,8 +92,4 @@ To see the documentation and configuration files for versions prior to 2.0 see <
 
 Shiny is registered trademarks of RStudio, Inc. The use of the trademarked terms Shiny through the images hosted on hub.docker.com has been granted by explicit permission of RStudio. Please review RStudio's trademark use policy and address inquiries about further distribution or other questions to [email protected].
 
-Jupyter is distributed under the BSD 3-Clause license (Copyright (c) 2017, Project Jupyter Contributors)
-
-## Acknowledgements
-
-Thanks to Ajar Vashisth for helping me get started with Docker and Docker Compose. Thanks also to Raghav Prasad for setting up the > 2.0.0 versions of the docker images to start from <a href="https://github.com/jupyter/docker-stacks" target="_blank">Jupyter</a> docker images.
+Jupyter is distributed under the BSD 3-Clause license (Copyright (c) 2017, Project Jupyter Contributors)
diff --git a/install/rsm-msba-chromeos.md b/install/rsm-msba-chromeos.md
@@ -51,8 +51,6 @@ This step will clone and start up a script that will finalize the installation o
 
 <img src="figures/rsm-msba-menu-linux.png" width="500px">
 
-After running this command you will be able to start the docker container by typing `launch` from a terminal.
-
 **Step 3**: Check that you can launch Jupyter and Rstudio
 
 You will know that the installation was successful if you can start Rstudio and Jupyter Lab. If you press 1 (+ Enter) Jupyter Lab should start up in your default web browser. If you are asked for login credentials, the **username is "jovyan"** and the **password is "jupyter"**. Have your browser remember the username and password so you won't be asked for it again.When you press 2 (+ Enter) in the terminal, Rstudio should start up in a new tab in your web browser.  

diff --git a/install/rsm-msba-linux.md b/install/rsm-msba-linux.md
@@ -57,8 +57,6 @@ Run the command below to start the launch script from the command line.
 ~/git/docker/launch-rsm-msba-arm-chromeos.sh -v ~;
 ```
 
-After running this command you will be able to start the docker container by typing `launch` from a terminal.
-
 **Step 3**: Check that you can launch Jupyter and Rstudio
 
 You will know that the installation was successful if you can start Rstudio and Jupyter Lab. If you press 1 (+ Enter) Jupyter Lab should start up in your default web browser. If you are asked for login credentials, the **username is "jovyan"** and the **password is "jupyter"**. Have your browser remember the username and password so you won't be asked for it again. When you press 2 (+ Enter) in the terminal, Rstudio should start up in a new tab in your web browser.  

diff --git a/install/rsm-msba-macos-arm.md b/install/rsm-msba-macos-arm.md
diff --git a/install/rsm-msba-macos-m1.md b/install/rsm-msba-macos-m1.md
@@ -59,8 +59,6 @@ Run the command below to launch the docker container from the command line.
 ~/git/docker/launch-rsm-msba-arm.sh -v ~;
 ```
 
-After running this command you will be able to start the docker container by typing `launch` from a terminal.
-
 **Step 4**: Check that you can launch Jupyter
 
 You will know that the installation was successful if you can start Jupyter Lab. When you press 1 (+ Enter) in the terminal, Jupyter Lab should start up in your default web browser. If you are asked for login credentials, the username is "jovyan" and the password is "jupyter". Have your browser remember the username and password so you won't be asked for it again.

diff --git a/install/rsm-msba-macos.md b/install/rsm-msba-macos.md
@@ -55,8 +55,6 @@ Run the command below to launch the docker container from the command line.
 ~/git/docker/launch-rsm-msba-intel.sh -v ~;
 ```
 
-After running this command you will be able to start the docker container by typing `launch` from a terminal.
-
 **Step 4**: Check that you can launch Jupyter and Rstudio
 
 You will know that the installation was successful if you can start Jupyter Lab. When you press 1 (+ Enter) in the terminal, Jupyter Lab should start up in your default web browser. If you are asked for login credentials, the username is "jovyan" and the password is "jupyter". Have your browser remember the username and password so you won't be asked for it again. When you press 2 (+ Enter) in the terminal, Rstudio should start up in a new tab in your web browser.

diff --git a/install/rsm-msba-windows-arm.md b/install/rsm-msba-windows-arm.md
@@ -165,6 +165,25 @@ The created and launched script will finalize the installation of the computing
 
 <img src="figures/rsm-launch-menu-wsl2.png" width="500px">
 
+<!--
+**Trouble shooting 1**
+
+If you see a several "permission" related message when you run the code above, you might have an issue.  
+
+```bash
+cd ~;
+ls;
+```
+
+The fix should be as follow:
+
+```bash
+sudo su
+chown -R jovyan /home/jovyan
+exit
+```
+-->
+
 **Trouble shooting**
 
 If you see `Base dir.: /root` as shown in the image below there was an issue creating a new user at the beginning of Step 4. 

diff --git a/install/rsm-msba-windows.md b/install/rsm-msba-windows.md
@@ -171,6 +171,25 @@ The created and launched script will finalize the installation of the computing
 
 <img src="figures/rsm-launch-menu-wsl2.png" width="500px">
 
+<!--
+**Trouble shooting 1**
+
+If you see a several "permission" related message when you run the code above, you might have an issue.  
+
+```bash
+cd ~;
+ls;
+```
+
+The fix should be as follow:
+
+```bash
+sudo su
+chown -R jovyan /home/jovyan
+exit
+```
+-->
+
 **Trouble shooting**
 
 If you see `Base dir.: /root` as shown in the image below there was an issue creating a new user at the beginning of Step 4. 

diff --git a/rsm-msba-arm/Dockerfile b/rsm-msba-arm/Dockerfile
@@ -32,6 +32,7 @@ RUN apt-get update -qq && apt-get -y --no-install-recommends install \
   ant \
   ca-certificates-java \
   lsof \
+  rename \
   pipx \
   && apt-get clean \
   && update-ca-certificates -f;

diff --git a/rsm-msba-intel/Dockerfile b/rsm-msba-intel/Dockerfile
@@ -32,6 +32,7 @@ RUN apt-get update -qq && apt-get -y --no-install-recommends install \
   ant \
   ca-certificates-java \
   lsof \
+  rename \
   pipx \
   && apt-get clean \
   && update-ca-certificates -f;