tweaks to docker containers

rpodcast · rpodcast · commit 9b97b333d54e · 2022-04-25T15:00:40.000Z
diff --git a/.devcontainer/.env b/.devcontainer/.env
@@ -1,4 +1,3 @@
-
 INSTALL_ZSH=false
 INSTALL_FISH=true
 UPGRADE_PACKAGES=true
@@ -10,9 +9,8 @@ USERID=1000
 GROUPID=1000
 PASSWORD=1rstudio
 VOLUME_PATH=/home/eric/r_dev_projects
-LOCAL_PORT=2009
-CONTAINER_NAME=rstudioquarto
+LOCAL_PORT=2010
 QUARTO_VERSION=latest
 RSTUDIO_VERSION=2022.02.1-461
 S6_VERSION=v1.21.7.0
-COMPOSE_PROJECT_NAME=rdevprojects
+COMPOSE_PROJECT_NAME=rdevprojects
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -15,19 +15,17 @@ ARG INSTALL_OHMYZSH="false"
 ARG INSTALL_NONFREE="false"
 ARG QUARTO_VERSION=latest
 
-# [Optional] Uncomment this section to install additional OS packages.
 # key dependencies for certain R packages
 RUN apt-get update \
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends software-properties-common wget libssl-dev libxml2-dev libcurl4-openssl-dev python3-pip pandoc libzip-dev \
-    && apt-get -y install --no-install-recommends libfreetype6-dev libfontconfig1-dev tk \
+    && apt-get -y install --no-install-recommends software-properties-common curl wget libssl-dev libxml2-dev libsodium-dev imagemagick libmagick++-dev libgit2-dev libssh2-1-dev zlib1g-dev librsvg2-dev libudunits2-dev libcurl4-openssl-dev python3-pip pandoc libzip-dev libfreetype6-dev libfontconfig1-dev tk libpq5 libxt6 openssh-client openssh-server \
     && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*
 
 COPY library-scripts/common-debian.sh /tmp/library-scripts/
 RUN apt-get update && bash /tmp/library-scripts/common-debian.sh ${INSTALL_ZSH} ${USERNAME} ${USER_UID} ${USER_GID} ${UPGRADE_PACKAGES} ${INSTALL_OHMYZSH} ${INSTALL_NONFREE}
 
 # install R packages needed for VSCode interaction and package management
-RUN install2.r languageserver renv remotes httpgd
+RUN install2.r --error --skipinstalled --ncpus -4 languageserver renv remotes httpgd
 
 # install radian via python and pip3
 RUN apt-get update \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -5,42 +5,10 @@
 	"dockerComposeFile": "docker-compose.yml",
 	"workspaceFolder": "/workspace",
 	"service": "vscode",
-	//"build": {
-	//	"dockerfile": "Dockerfile",
-	//	"args": {
-	//		"USERNAME": "${localEnv:USER}",
-	//		"QUARTO_VERSION": "${localEnv:QUARTO_VERSION}"
-	//	}
-	//},
-	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined", "--env-file", ".devcontainer/.env" ],
 
-	// Add more local mounts to container
-	// The first mounts are for a local pulseaudio server on linux
-	// You can leave these commented out or delete if you are not linking the contianer to a linux sound system
-	// "mounts": [
-		//"source=/etc/alsa,target=/etc/alsa,type=bind,consistency=cached",
-		//"source=/usr/share/alsa,target=/usr/share/alsa,type=bind,consistency=cached",
-		//"source=/run/user/1000/pulse/native,target=/run/user/1000/pulse/native,type=bind,consistency=cached",
-		//"source=/media/media_drive1/obs_files/audio_assets/soundboard_files,target=/soundboard_files,type=bind,consistency=cached",
-	//	"source=/opt/local/renv/cache,target=/renv/cache,type=bind,consistency=cached"
-	// ],
 	"features": {
-		//"common": {
-		//	"username": "${localEnv:USER}",
-		//	"uid": "1000",
-		//	"gid": "1000",
-		//	"installZsh": false,
-		//	"installOhMyZsh": false,
-		//	"upgradePackages": true,
-		//	"nonFreePackages": true
-		//},
 		"fish": "latest"
 	},
-	// Configure environment variables for audio sound server if needed
-	// You can leave these commented out or delete if you are not linking the contianer to a linux sound system
-	//"containerEnv": {
-	//	"PULSE_SERVER": "unix:/run/user/1000/pulse/native"
-	//},
 
 	// Set *default* container specific settings.json values on container create.
 	"settings": {
@@ -84,16 +52,16 @@
 		"Rubymaniac.vscode-paste-and-indent",
 		"GrapeCity.gc-excelviewer",
 		"IBM.output-colorizer",
-		"Mohamed-El-Fodil-Ihaddaden.shinysnip",
+		//"Mohamed-El-Fodil-Ihaddaden.shinysnip",
 		"hediet.vscode-drawio",
-		"MS-vsliveshare.vsliveshare-pack",
+		//"MS-vsliveshare.vsliveshare-pack",
 		"ms-python.python",
 		"RDebugger.r-debugger",
 		//"GitHub.copilot",
 		"eamodio.gitlens",
 		"GitHub.vscode-pull-request-github",
-		"quarto.quarto",
-		"hoovercj.vscode-power-mode"
+		"quarto.quarto"
+		//"hoovercj.vscode-power-mode"
 	]
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -19,14 +19,13 @@ services:
     command: sleep infinity
     env_file: .env
 
-  rstudioquarto:
+  rstudiodevcontainer:
     build:
       context: ./rstudio_docker
       args:
         S6_VERSION: ${S6_VERSION}
         RSTUDIO_VERSION: ${RSTUDIO_VERSION}
         QUARTO_VERSION: ${QUARTO_VERSION}
-    container_name: ${CONTAINER_NAME}
     volumes:
       - ${VOLUME_PATH}:${VOLUME_PATH}
       - /home/${USER}/.ssh:/home/${USER}/.ssh
@@ -36,4 +35,4 @@ services:
       unless-stopped
     ports:
       - ${LOCAL_PORT}:8787
-    env_file: .env
+    env_file: .env
diff --git a/.devcontainer/rstudio_docker/.env b/.devcontainer/rstudio_docker/.env
diff --git a/.devcontainer/rstudio_docker/Dockerfile b/.devcontainer/rstudio_docker/Dockerfile
@@ -15,9 +15,11 @@ ENV RSTUDIO_VERSION=$RSTUDIO_VERSION
 ENV PATH=/usr/lib/rstudio-server/bin:$PATH
 ENV QUARTO_VERSION=$QUARTO_VERSION
 
+# key dependencies for certain R packages
 RUN apt-get update \
     && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends libpq5 openssh-client openssh-server
+    && apt-get -y install --no-install-recommends software-properties-common curl wget libssl-dev libxml2-dev libsodium-dev imagemagick libmagick++-dev libgit2-dev libssh2-1-dev zlib1g-dev librsvg2-dev libudunits2-dev libcurl4-openssl-dev python3-pip pandoc libzip-dev libfreetype6-dev libfontconfig1-dev tk libpq5 libxt6 openssh-client openssh-server \
+    && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/*
 
 RUN /rocker_scripts/install_rstudio.sh
 RUN /rocker_scripts/install_pandoc.sh
diff --git a/.devcontainer/rstudio_docker/rstudio.env b/.devcontainer/rstudio_docker/rstudio.env
