shinyproxy 3.2.2 (#26)

* shinyproxy 3.2.2
* readme
* changelog
* CI

Author: jwijffels

.github/workflows/build.yml

@@ -29,6 +29,7 @@ jobs:
           #- { tag: "shinyproxy-3.0.2", dockerfile: "shinyproxy/3.0.2/Dockerfile", context: "shinyproxy/3.0.2"}    
           - { tag: "shinyproxy-3.1.1", dockerfile: "shinyproxy/3.1.1/Dockerfile", context: "shinyproxy/3.1.1"}   
           - { tag: "shinyproxy-3.2.0", dockerfile: "shinyproxy/3.2.0/Dockerfile", context: "shinyproxy/3.2.0"}   
+          - { tag: "shinyproxy-3.2.2", dockerfile: "shinyproxy/3.2.2/Dockerfile", context: "shinyproxy/3.2.2"}   
           - { tag: "rstudio", dockerfile: "development/rstudio/Dockerfile", context: "development/rstudio"}       
           - { tag: "vscode", dockerfile: "development/vscode/Dockerfile", context: "development/vscode"}    
           - { tag: "ollama-llama3.2", dockerfile: "ollama/Dockerfile", context: "ollama", OLLAMA_MODEL: "llama3.2:3b"}     

CHANGELOG

@@ -1,5 +1,11 @@
 ## CHANGELOG
 
+### Release 0.3.2
+
+- blackbar-shinyproxy
+   - blackbar-shinyproxy-3.2.2 added
+   - Based on Ubuntu 24.04 and Java 21 adding "-XX:MaxRAMPercentage=50.0", "-XX:MinRAMPercentage=20.0", "-XX:+ExitOnOutOfMemoryError" to java options at startup
+
 ### Release 0.3.1
 
 - blackbar-inception-minio and blackbar-inception-minio-mariadb

README.md

@@ -37,11 +37,13 @@ docker pull ghcr.io/bnosac/blackbar-inception-minio-mariadb:latest
 
 - **blackbar-shinyproxy**:  
 
+   - **blackbar-shinyproxy-3.2.2**: Docker image containing ShinyProxy 3.2.2 and Java 21 based on Ubuntu Noble (eclipse-temurin:21-jre-noble)
    - **blackbar-shinyproxy-3.2.0**: Docker image containing ShinyProxy 3.2.0 and Java 21 based on Ubuntu Noble (eclipse-temurin:21-jre-noble)
    - **blackbar-shinyproxy-3.1.1**: Docker image containing ShinyProxy 3.1.1 and Java 17 based on Ubuntu Jammy (eclipse-temurin:17-jammy)
    - **blackbar-shinyproxy-3.0.2**: Docker image containing ShinyProxy 3.0.2 and Java 11 based on Debian Buster (openjdk:11-jre-slim-buster)
 
 ```
+docker pull ghcr.io/bnosac/blackbar-shinyproxy-3.2.2:latest
 docker pull ghcr.io/bnosac/blackbar-shinyproxy-3.2.0:latest
 docker pull ghcr.io/bnosac/blackbar-shinyproxy-3.1.1:latest
 docker pull ghcr.io/bnosac/blackbar-shinyproxy-3.0.2:latest

shinyproxy/3.2.2/Dockerfile

@@ -0,0 +1,29 @@
+FROM openanalytics/shinyproxy:3.2.2 AS shinyproxy
+FROM public.ecr.aws/docker/library/eclipse-temurin:21-jre-noble
+
+RUN set -ex \
+    && DEBIAN_FRONTEND=noninteractive \
+    && apt-get update \
+    && apt-get install -y gettext \
+    && apt-get install -y curl 
+
+## Copy over shinyproxy.jar from the official shinyproxy repository
+RUN mkdir /opt/shinyproxy
+ENV SHINY_USER blackbar
+RUN useradd -c 'blackbar user' -m -d /home/$SHINY_USER -s /sbin/nologin $SHINY_USER
+COPY --from=shinyproxy --chown=$SHINY_USER:$SHINY_USER /opt/shinyproxy/ /opt/shinyproxy/
+
+## Entrypoint is shell script which overwrites the applications  
+ENV SHINYPROXY_APPLICATION_DIR /home/$SHINY_USER/apps
+
+ADD ./entrypoint.sh /opt/shinyproxy/init-application-yml.sh
+RUN chmod +x /opt/shinyproxy/init-application-yml.sh
+ENTRYPOINT ["sh", "/opt/shinyproxy/init-application-yml.sh"]
+
+WORKDIR /opt/shinyproxy
+USER $SHINY_USER
+
+EXPOSE 8080
+
+# Start ShinyProxy with some extra parameters for faster startup (https://spring.io/blog/2018/11/08/spring-boot-in-a-container#tweaks)
+CMD ["java", "-Dsun.net.inetaddr.ttl=5", "-XX:MaxRAMPercentage=50.0", "-XX:MinRAMPercentage=20.0", "-XX:+ExitOnOutOfMemoryError", "-jar", "/opt/shinyproxy/shinyproxy.jar", "--spring.jmx.enabled=false", "--spring.config.location=/opt/shinyproxy/application.yml"]

shinyproxy/3.2.2/entrypoint.sh

@@ -0,0 +1,33 @@
+#!/bin/ash
+set -e
+
+echo "Checking ${SHINYPROXY_APPLICATION_DIR} for Shinyproxy config file either as application.tmp or as application.yml"
+
+# substitute ${ENV_VARIABLE}s in application.tmp with container environment variables
+if [ -f ${SHINYPROXY_APPLICATION_DIR}/application.tmp ]; then
+    echo "  - found application.tmp; plugging in environment variables to application.yml"
+    envsubst < ${SHINYPROXY_APPLICATION_DIR}/application.tmp > /opt/shinyproxy/application.yml
+fi
+
+# If file ${SHINYPROXY_APPLICATION_DIR}/application.yml is available, make the shinyproxy configuration available to the application
+if [ -f ${SHINYPROXY_APPLICATION_DIR}/application.yml ]; then
+    #rm --force ${SHINYPROXY_INSTALL_DIR}/application.yml
+    cp --force ${SHINYPROXY_APPLICATION_DIR}/application.yml /opt/shinyproxy/application.yml
+    echo "  - copying ${SHINYPROXY_APPLICATION_DIR}/application.yml to /opt/shinyproxy/application.yml in Shinyproxy container"
+else
+    echo "No 'application.yml' was found: defaulting to default Shinyproxy configuration"
+fi
+
+# If there is an apps folder in the SHINYPROXY_INSTALL_DIR, copy the files over (for development purposes)
+if [ -d ${SHINYPROXY_APPLICATION_DIR}/apps ]; then
+    echo "  - moving all apps from ${SHINYPROXY_APPLICATION_DIR}/apps to ${SHINYPROXY_INSTALL_DIR} in Shinyproxy container"
+    cp --force --recursive ${SHINYPROXY_APPLICATION_DIR}/apps /opt/shinyproxy/blackbar
+    chown -R $SHINY_USER:$SHINY_USER /opt/shinyproxy/blackbar/apps/
+else
+    echo "Note: no 'apps' folder at ${SHINYPROXY_APPLICATION_DIR}"
+fi
+
+cat /opt/shinyproxy/application.yml
+echo "\nStarting up Shinyproxy\n"
+
+exec "$@"