Merge branch 'release/3.2.0'

Author: LEDfan

.editorconfig

@@ -1109,6 +1109,7 @@ ij_hcl_spaces_within_brackets = false
 ij_hcl_wrap_long_lines = false
 
 [{*.htm,*.html,*.sht,*.shtm,*.shtml}]
+max_line_length = 240
 ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
 ij_html_align_attributes = true
 ij_html_align_text = false
@@ -1119,7 +1120,7 @@ ij_html_do_not_align_children_of_min_lines = 0
 ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p
 ij_html_do_not_indent_children_of_tags = none
 ij_html_enforce_quotes = false
-ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var
+ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var,th:block
 ij_html_keep_blank_lines = 2
 ij_html_keep_indents_on_empty_lines = false
 ij_html_keep_line_breaks = true
@@ -1139,7 +1140,7 @@ ij_html_text_wrap = normal
 [{*.http,*.rest}]
 indent_size = 0
 ij_continuation_indent_size = 4
-ij_http request_call_parameters_wrap = normal
+ij_http_request_call_parameters_wrap = normal
 
 [{*.jsf,*.jsp,*.jspf,*.tag,*.tagf,*.xjsp}]
 ij_jsp_jsp_prefer_comma_separated_import_list = false

Jenkinsfile

@@ -0,0 +1,62 @@
+pipeline {
+
+    agent {
+        kubernetes {
+            inheritFrom "default"
+            yamlFile 'kubernetesPod.yaml'
+            yamlMergeStrategy merge()
+        }
+    }
+
+    parameters {
+        booleanParam(name: 'SkipTests', defaultValue: false)
+    }
+
+    options {
+        buildDiscarder(logRotator(numToKeepStr: '3'))
+    }
+
+    stages {
+        stage('prepare') {
+            steps {
+                container('docker') {
+                    sh 'docker pull openanalytics/shinyproxy-integration-test-app'
+                }
+            }
+        }
+
+        stage('build'){
+            steps {
+                container('shinyproxy-build') {
+                     configFileProvider([configFile(fileId: 'maven-settings-rsb', variable: 'MAVEN_SETTINGS_RSB')]) {
+                         sh 'mvn -Dmaven.repo.local=/tmp/m2 -B -s $MAVEN_SETTINGS_RSB -U clean package -DskipTests'
+                     }
+                }
+            }
+        }
+
+        stage('test'){
+            when {
+                equals expected: false, actual: params.SkipTests
+            }
+
+            steps {
+                container('shinyproxy-build') {
+                    configFileProvider([configFile(fileId: 'maven-settings-rsb', variable: 'MAVEN_SETTINGS_RSB')]) {
+                        sh 'mvn -Dmaven.repo.local=/tmp/m2 -B -s $MAVEN_SETTINGS_RSB test'
+                    }
+                }
+            }
+        }
+
+        stage('deploy to Nexus'){
+            steps {
+                container('shinyproxy-build') {
+                    configFileProvider([configFile(fileId: 'maven-settings-rsb', variable: 'MAVEN_SETTINGS_RSB')]) {
+                        sh 'mvn -Dmaven.repo.local=/tmp/m2 -B -s $MAVEN_SETTINGS_RSB deploy -DskipTests'
+                    }
+                }
+            }
+        }
+    }
+}

JenkinsfileSCM

@@ -1,6 +1,6 @@
-ShinyProxy
+${project.name}
 
-Copyright (C) 2016-2024 Open Analytics
+Copyright (C) ${project.inceptionYear}-${year} Open Analytics
 
 ===========================================================================
 

LICENSE_HEADER

@@ -10,15 +10,25 @@
 
 </pre>
 
-[![Build Status](https://travis-ci.org/openanalytics/shinyproxy.svg?branch=master)](https://travis-ci.org/openanalytics/shinyproxy)
-
 # ShinyProxy
 
-Open Source Enterprise Deployment for Shiny Apps
+Open Source Enterprise Deployment for Data Science Apps
+
+Learn more at <https://shinyproxy.io>
+
+**(c) Copyright Open Analytics NV, 2016-2025 - Apache License 2.0**
+
+## Docs
 
-Learn more at https://shinyproxy.io
+See the [website](https://shinyproxy.io) for all documentation.
 
-#### (c) Copyright Open Analytics NV, 2016-2023 - Apache License 2.0
+## Support
+
+See the [website](https://shinyproxy.io/support/) on how to get support.
+
+## Announcements
+
+Subscribe on the [community forum](https://support.openanalytics.eu/c/shinyproxy/shinyproxy-announcements/10) for announcements of new releases and features.
 
 ## Building from source
 
@@ -33,12 +43,12 @@ The build will result in a single `.jar` file that is made available in the `tar
 ## Running the application
 
 ```
-java -jar shinyproxy-3.0.0.jar
+java -jar shinyproxy-3.2.0.jar
 ```
 
-Navigate to http://localhost:8080 to access the application.  If the default configuration is used, authentication will be done against the LDAP server at *ldap.forumsys.com*; to log in one can use the user name "tesla" and password "password".
-
+Navigate to <http://localhost:8080> to access the application. To log in, use
+the username "jack" and password "password".
 
 ## Further information
 
-https://shinyproxy.io
+<https://shinyproxy.io>

README.md

@@ -1,22 +1,54 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: shinyproxy
   labels:
     ci: shinyproxy-build
 spec:
+  volumes:
+    - name: docker-socket
+      emptyDir: { }
+    - name: tmp
+      emptyDir: { }
   containers:
-    - name: containerproxy-build
-      image: public.ecr.aws/docker/library/maven:3-eclipse-temurin-17-focal
+    - name: shinyproxy-build
+      image: public.ecr.aws/docker/library/maven:3-eclipse-temurin-21-jammy
+      securityContext:
+        runAsUser: 1000
+        runAsGroup: 2375
       command:
         - cat
       tty: true
+      env:
+        - name: DOCKER_HOST
+          value: unix:///var/run/docker/docker.sock
+      volumeMounts:
+        - mountPath: /var/run/docker
+          name: docker-socket
+        - mountPath: /tmp/
+          name: tmp
+      resources:
+       requests:
+         memory: "4Gi"
+         cpu: "2"
+       limits:
+         memory: "4Gi"
+         cpu: "2"
+    - name: docker
+      image: public.ecr.aws/docker/library/docker:dind
+      securityContext:
+        privileged: true
+      env:
+        - name: DOCKER_HOST
+          value: unix:///var/run/docker/docker.sock
+      volumeMounts:
+        - mountPath: /var/run/docker
+          name: docker-socket
+        - mountPath: /tmp/
+          name: tmp
       resources:
         requests:
-          ephemeral-storage: "20Gi"
-          memory: "2Gi"
-          cpu: "1.0"
+          memory: "4Gi"
+          cpu: "2"
         limits:
           memory: "4Gi"
-          cpu: "1.5"
-          ephemeral-storage: "20Gi"
+          cpu: "2"