Merge branch 'release/1.0.0'

openanalytics · Mar 2, 2023 · ff3f75a · ff3f75a
2 parents 7e1a106 + 3a7ae4c
commit ff3f75a
Show file tree

Hide file tree

Showing 278 changed files with 14,539 additions and 6,383 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.github/workflows/workflows.yaml b/.github/workflows/workflows.yaml
@@ -7,8 +7,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8, 11 ]
-        kubernetes: [ 'v1.21.6', 'v1.20.12', 'v1.19.16', 'v1.18.20', 'v1.17.17', 'v1.16.15']
+        java:
+          - 8
+          - 11
+        kubernetes:
+          - 'v1.21.6'
+          - 'v1.22.17'
+          - 'v1.23.15'
+          - 'v1.24.9'
+          - 'v1.25.5'
 
     steps:
       - uses: actions/checkout@v2
@@ -23,20 +30,27 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.3.0
+        uses: manusa/actions-setup-minikube@v2.7.2
         with:
-          minikube version: 'v1.16.0'
+          minikube version: 'v1.28.0'
           kubernetes version:  ${{ matrix.kubernetes }}
+          github token: ${{ secrets.GITHUB_TOKEN }}
       - 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: Setup Docker Swarm
         run: docker swarm init
       - name: Pull Image
         run: docker pull openanalytics/shinyproxy-demo:latest
+      - name: Run redis
+        run: docker run -d -p 6379:6379 redis
       - name: Build with Maven
         run: mvn -B -U clean install -DskipTests
       - name: Copy Artifact
         run: cp target/containerproxy-*-exec.jar target/containerproxy-app-recovery.jar
+      - name: debug
+        run: |
+          docker ps -a
+          kubectl get pod -A
       - name: Run Tests
         run: mvn -B test
 
@@ -52,4 +66,3 @@ jobs:
         with:
           name: dependency-check-report
           path: target/dependency-check-report.html
-
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,6 @@ logs
 .idea
 *.iml
 *.log
+.project
+.classpath
+.settings
diff --git a/.project b/.project
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
diff --git a/LICENSE_HEADER b/LICENSE_HEADER
@@ -1,6 +1,6 @@
 ContainerProxy
 
-Copyright (C) 2016-2021 Open Analytics
+Copyright (C) 2016-2023 Open Analytics
 
 ===========================================================================
 

diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ It is the engine that powers a.o. [ShinyProxy](https://shinyproxy.io) but can be
 
 Learn more at https://containerproxy.io (in progress)
 
-#### (c) Copyright Open Analytics NV, 2017-2021 - Apache License 2.0
+#### (c) Copyright Open Analytics NV, 2017-2023 - Apache License 2.0
 
 ## Building from source