Merge remote-tracking branch 'upstream/master'

r-ver/Dockerfile

@@ -13,8 +13,8 @@ ENV R_VERSION=${R_VERSION:-3.4.1} \
     TERM=xterm
 
 ## dependencies. Use cloudfront, official CDN gives frequent 503 errors
-RUN sed -i "s/deb.debian.org/cloudfront.debian.net/" /etc/apt/sources.list \
-  && sed -i "s/security.debian.org/cloudfront.debian.net\/debian-security/" /etc/apt/sources.list \
+RUN sed -i "s/deb.debian.org/cdn-fastly.deb.debian.org/" /etc/apt/sources.list \
+  && sed -i "s/security.debian.org/cdn-fastly.debian.org\/debian-security/" /etc/apt/sources.list \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
     bash-completion \

rstudio/3.3.1/add_shiny.sh

@@ -23,6 +23,7 @@ if [ "$ADD" == "shiny" ]; then
     cd /etc/services.d/shiny-server && \
     echo '#!/bin/bash' > run && echo 'exec shiny-server' >> run && \
     chmod +x run && \
+    adduser rstudio shiny \
     cd /
 fi
 

rstudio/3.3.2/add_shiny.sh

@@ -23,6 +23,7 @@ if [ "$ADD" == "shiny" ]; then
     cd /etc/services.d/shiny-server && \
     echo '#!/bin/bash' > run && echo 'exec shiny-server' >> run && \
     chmod +x run && \
+    adduser rstudio shiny \
     cd /
 fi
 

rstudio/3.3.3/add_shiny.sh

@@ -23,6 +23,7 @@ if [ "$ADD" == "shiny" ]; then
     cd /etc/services.d/shiny-server && \
     echo '#!/bin/bash' > run && echo 'exec shiny-server' >> run && \
     chmod +x run && \
+    adduser rstudio shiny \
     cd /
 fi
 

rstudio/3.4.0/add_shiny.sh

@@ -23,6 +23,7 @@ if [ "$ADD" == "shiny" ]; then
     cd /etc/services.d/shiny-server && \
     echo '#!/bin/bash' > run && echo 'exec shiny-server' >> run && \
     chmod +x run && \
+    adduser rstudio shiny \
     cd /
 fi
 

rstudio/3.4.1/add_shiny.sh

@@ -23,6 +23,7 @@ if [ "$ADD" == "shiny" ]; then
     cd /etc/services.d/shiny-server && \
     echo '#!/bin/bash' > run && echo 'exec shiny-server' >> run && \
     chmod +x run && \
+    adduser rstudio shiny \
     cd /
 fi
 

rstudio/add_shiny.sh

@@ -23,6 +23,7 @@ if [ "$ADD" == "shiny" ]; then
     cd /etc/services.d/shiny-server && \
     echo '#!/bin/bash' > run && echo 'exec shiny-server' >> run && \
     chmod +x run && \
+    adduser rstudio shiny \
     cd /
 fi
 

rstudio/devel/add_shiny.sh

@@ -23,6 +23,7 @@ if [ "$ADD" == "shiny" ]; then
     cd /etc/services.d/shiny-server && \
     echo '#!/bin/bash' > run && echo 'exec shiny-server' >> run && \
     chmod +x run && \
+    adduser rstudio shiny \
     cd /
 fi