Merge branch 'docker-images' into test-images

.gitlab-ci.yml

@@ -130,7 +130,8 @@ build_r:
         R_VERSION: [
            "3.6.3",
            "4.2.3", 
-           "4.3.1", 
+           "4.3.1",
+           "4.4.0" 
         ]
         UBUNTU_VERSION: [
            "jammy",
@@ -166,14 +167,13 @@ publish_listing:
   
 
 
-# update_docs:
-#   only:
-#     - docker-images
-#     - rework-image-matrix-and-export
-#   needs: []
-#   trigger:
-#     - project: hub/shiny-k8s
-#       branch: docs
+update_docs:
+  only:
+    - docker-images
+  needs: []
+  trigger:
+    - project: hub/shiny-k8s-example
+      branch: doc-trigger
   
 
 

Dockerfile.python

@@ -8,10 +8,12 @@ ENV SHINY_LOG_STDERR=1
 EXPOSE 3838
 CMD ["shiny-server"]
 
+RUN addgroup --gid 999 shiny \
+ && adduser --disabled-password --gecos '' --uid 999 --gid 999 shiny 
+
 # install dependencies
 RUN apt-get update \
  && apt-get install -y \
-     software-properties-common \
      wget \
      nano \
      wget \

Dockerfile.r

@@ -8,6 +8,9 @@ ENV SHINY_LOG_STDERR=1
 EXPOSE 3838
 CMD ["shiny-server"]
 
+RUN addgroup --gid 999 shiny \
+ && adduser --disabled-password --gecos '' --uid 999 --gid 999 shiny
+
 # install dependencies
 RUN apt-get update \
  && apt-get install -y \

scripts/configure_Rprofile.sh

@@ -9,6 +9,7 @@ options(
     repos = c(${MIRRORS:-${DEFAULT_MIRRORS}}),
     download.file.method = 'libcurl'
 )
+options(bitmapType='cairo')
 EOF
 
 echo "Here is the configured Rprofile"