Merge branch 'release/3.1.0'

openanalytics · May 7, 2024 · 8ae5076 · 8ae5076
2 parents e6f8d80 + 50fa99e
commit 8ae5076
Show file tree

Hide file tree

Showing 78 changed files with 6,848 additions and 3,343 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.github/workflows/workflows.yaml b/.github/workflows/workflows.yaml
@@ -1,13 +1,16 @@
 name: Tests
 
-on: [push]
+on:
+  push:
+  workflow_dispatch:
 
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8, 11 ]
+        java:
+          - 17
 
     steps:
       - uses: actions/checkout@v2
@@ -21,6 +24,10 @@ jobs:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
+      - name: Setup Docker
+        run: sudo apt-get -qq -y install conntrack socat ; nohup socat TCP-LISTEN:2375,reuseaddr,fork UNIX-CONNECT:/var/run/docker.sock &
+      - name: Pull Image
+        run: docker pull openanalytics/shinyproxy-integration-test-app
       - name: Build with Maven
         run: mvn -U clean install -DskipTests
       - name: Run Tests
@@ -31,11 +38,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+      - name: Set up JDK
+        uses: actions/setup-java@v1
+        with:
+          java-version: 17
       - name: Run Dependency Check
         run: mvn -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
-
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,9 @@
 /application.yml
 /.project
 *.gz
+*.zip
+.vscode/
+.idea/
 .project
 .classpath
 .settings

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -3,7 +3,6 @@ pipeline {
     agent {
         kubernetes {
             yamlFile 'kubernetesPod.yaml'
-            workspaceVolume dynamicPVC(accessModes: 'ReadWriteOnce', requestsSize: '40Gi')
         }
     }
 
@@ -21,7 +20,7 @@ pipeline {
 
                      configFileProvider([configFile(fileId: 'maven-settings-rsb', variable: 'MAVEN_SETTINGS_RSB')]) {
 
-                         sh 'mvn -B -s $MAVEN_SETTINGS_RSB -Dmaven.repo.local=/home/jenkins/agent/m2 -U clean deploy'
+                         sh 'mvn -B -s $MAVEN_SETTINGS_RSB -U clean deploy -DskipTests=true'
 
                      }
                 }

diff --git a/LICENSE_HEADER b/LICENSE_HEADER
@@ -1,6 +1,6 @@
 ShinyProxy
 
-Copyright (C) 2016-2023 Open Analytics
+Copyright (C) 2016-2024 Open Analytics
 
 ===========================================================================
 

diff --git a/kubernetesPod.yaml b/kubernetesPod.yaml
@@ -5,20 +5,12 @@ metadata:
   labels:
     ci: shinyproxy-build
 spec:
-  securityContext:
-    fsGroup: 65534
   containers:
     - name: containerproxy-build
-      image: 196229073436.dkr.ecr.eu-west-1.amazonaws.com/openanalytics/containerproxy-build
-      securityContext:
-        privileged: true
-      command: [ "sh" ]
-      args: [ "/usr/src/app/docker-entrypoint.sh" ]
+      image: public.ecr.aws/docker/library/maven:3-eclipse-temurin-17-focal
+      command:
+        - cat
       tty: true
-      volumeMounts:
-        - name: workspace-volume
-          subPath: docker
-          mountPath: /var/lib/docker
       resources:
         requests:
           ephemeral-storage: "20Gi"