Merge branch 'release/1.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

.github/workflows/workflows.yaml

@@ -16,30 +16,27 @@ jobs:
     strategy:
       matrix:
         java:
-          - 17
+          - 21
         kubernetes:
-          - 'v1.24.17'
-          - 'v1.25.16'
-          - 'v1.26.15'
-          - 'v1.27.13'
-          - 'v1.28.9'
-          - 'v1.29.4'
-          - 'v1.30.0'
+          - 'v1.30.11'
+          - 'v1.31.7'
+          - 'v1.32.3'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
+          distribution: temurin
       - name: Cache Maven packages
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.7.2
+        uses: manusa/actions-setup-minikube@v2.13.1
         with:
           minikube version: 'v1.33.0'
           kubernetes version:  ${{ matrix.kubernetes }}
@@ -58,20 +55,3 @@ jobs:
         run: mvn -B -U clean install -DskipTests
       - name: Run Tests
         run:  mvn -B test
-
-  dependency:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: 17
-      - name: Run Dependency Check
-        run: mvn -B -Powasp-dependency-check verify -DskipTests
-      - name: Archive code coverage results
-        uses: actions/upload-artifact@v2
-        with:
-          name: dependency-check-report
-          path: target/dependency-check-report.html

Jenkinsfile

@@ -0,0 +1,94 @@
+pipeline {
+
+    agent {
+        kubernetes {
+            inheritFrom "default"
+            yamlFile 'kubernetesPod.yaml'
+            yamlMergeStrategy merge()
+        }
+    }
+
+    parameters {
+        booleanParam(name: 'SkipTests', defaultValue: false)
+    }
+
+    options {
+        buildDiscarder(logRotator(numToKeepStr: '3'))
+    }
+
+    environment {
+        KUBERNETES_TRUST_CERTIFICATES = "true"
+        ITEST_ECS_REGION = "dummy-region"
+        ITEST_ECS_NAME = "dummy-name"
+        ITEST_ECS_SECURITY_GROUPS = "dummy-sg"
+        ITEST_ECS_SUBNETS = "dummy-subnets"
+    }
+
+    stages {
+
+        stage('prepare') {
+            steps {
+                container('docker') {
+                    sh 'echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories'
+                    sh 'apk add minikube@testing'
+                    sh 'docker network create sp-shared-network'
+                    sh 'docker swarm init'
+                    sh 'docker pull openanalytics/shinyproxy-integration-test-app'
+                    sh 'docker run -d -p 6379:6379 redis'
+                    sh 'adduser -D -u 1000 user && adduser user docker'
+                    sh "su user /bin/sh -c 'minikube start --driver=docker --force'"
+                    sh "su user /bin/sh -c 'minikube kubectl -- config view --flatten > /tmp/kubeconfig'"
+                    script {
+                        env.KUBERNETES_MASTER = "https://" + sh(returnStdout: true, script: "su user  /bin/sh -c 'minikube ip'").trim() + ":8443"
+                    }
+                }
+            }
+        }
+
+        stage('build') {
+            environment {
+                KUBECONFIG = "/tmp/kubeconfig"
+            }
+
+            steps {
+                container('containerproxy-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') {
+            environment {
+                KUBECONFIG = "/tmp/kubeconfig"
+            }
+
+            when {
+                equals expected: false, actual: params.SkipTests
+            }
+
+            steps {
+                container('containerproxy-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') {
+            environment {
+                KUBECONFIG = "/tmp/kubeconfig"
+            }
+
+            steps {
+                container('containerproxy-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 @@
-ContainerProxy
+${project.name}
 
-Copyright (C) 2016-2024 Open Analytics
+Copyright (C) ${project.inceptionYear}-${year} Open Analytics
 
 ===========================================================================
 

LICENSE_HEADER

@@ -8,17 +8,15 @@
 
 </pre>
 
-[![Build Status](https://travis-ci.org/openanalytics/containerproxy.svg?branch=master)](https://travis-ci.org/openanalytics/containerproxy)
-
 # ContainerProxy
 
 ContainerProxy is an application that launches and manages containers for users, to perform specific tasks.
 
 It is the engine that powers a.o. [ShinyProxy](https://shinyproxy.io) but can be used for any application that needs to manage HTTP proxy routes into Docker containers.
 
-Learn more at https://containerproxy.io (in progress)
+Learn more at <https://shinyproxy.io/> (in progress)
 
-#### (c) Copyright Open Analytics NV, 2017-2023 - Apache License 2.0
+**(c) Copyright Open Analytics NV, 2017-2025 - Apache License 2.0**
 
 ## Building from source
 
@@ -32,4 +30,4 @@ The build will result in a single `.jar` file that is made available in the `tar
 
 ## Further information
 
-https://containerproxy.io (in progress)
+<https://shinyproxy.io/>

README.md

@@ -1,22 +1,54 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: containerproxy
   labels:
     ci: containerproxy-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
+      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"