Merge pull request #113 from ccb-hms/develop

move env vars to Renviron.site, quote var values
ccb-hms · Nov 7, 2023 · 8e8f120 · 8e8f120
2 parents 07911fc + 8d284fb
commit 8e8f120
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Container/Dockerfile b/Container/Dockerfile
@@ -389,8 +389,8 @@ RUN chmod -R 777 /usr/local/lib/R/doc/html/packages.html
 ENV EPICONDUCTOR_CONTAINER_VERSION v0.1.1
 ENV EPICONDUCTOR_COLLECTION_DATE 2023-11-01
 
-RUN echo "EPICONDUCTOR_CONTAINER_VERSION=$EPICONDUCTOR_CONTAINER_VERSION" >> /usr/local/lib/R/etc/Renviron
-RUN echo "EPICONDUCTOR_COLLECTION_DATE=$EPICONDUCTOR_COLLECTION_DATE" >> /usr/local/lib/R/etc/Renviron
+RUN echo "EPICONDUCTOR_CONTAINER_VERSION=$EPICONDUCTOR_CONTAINER_VERSION" >> /usr/local/lib/R/etc/Renviron.site
+RUN echo "EPICONDUCTOR_COLLECTION_DATE=$EPICONDUCTOR_COLLECTION_DATE" >> /usr/local/lib/R/etc/Renviron.site
 
 RUN echo "EPICONDUCTOR_CONTAINER_VERSION=$EPICONDUCTOR_CONTAINER_VERSION" >> /etc/environment
 RUN echo "EPICONDUCTOR_COLLECTION_DATE=$EPICONDUCTOR_COLLECTION_DATE" >> /etc/environment

diff --git a/Container/startup.sh b/Container/startup.sh
@@ -28,8 +28,8 @@ then
 	runuser -m -p  mssql -c '/opt/mssql/bin/sqlservr &'
 
 	# make the SA password available to all users
-	echo "SA_PASSWORD=$SA_PASSWORD" >> /etc/environment
-	echo "SA_PASSWORD=$SA_PASSWORD" >> /usr/local/lib/R/etc/Renviron
+	echo "SA_PASSWORD=\"$SA_PASSWORD\"" >> /etc/environment
+	echo "SA_PASSWORD=\"$SA_PASSWORD\"" >> /usr/local/lib/R/etc/Renviron.site
 fi
 
 # start RStudio Server

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ The [Testing/Code](https://github.com/ccb-hms/NHANES/tree/main/Testing/Code) fol
 * `containerBuildTests.R` contains all tests completed at build time.
 
 ## Running the image
-An image with a pre-built database can be run as follows: (for other versions, see the [Dockerhub repository](https://hub.docker.com/r/hmsccb/nhanes-workbench/tags.) and use the desired tag. The current release is hmsccb/nhanes-workbench:version-0.1.1):
+An image with a pre-built database can be run as follows: (for other versions, see the [Dockerhub repository](https://hub.docker.com/r/hmsccb/nhanes-workbench/tags) and use the desired tag. The current release is hmsccb/nhanes-workbench:version-0.1.1):
 
 ```
 docker \