Skip to content

Commit ff3f75a

Browse files
committed
Merge branch 'release/1.0.0'
2 parents 7e1a106 + 3a7ae4c commit ff3f75a

File tree

278 files changed

+14539
-6383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+14539
-6383
lines changed

.classpath

Lines changed: 0 additions & 38 deletions
This file was deleted.

.github/workflows/workflows.yaml

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,15 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
java: [ 8, 11 ]
11-
kubernetes: [ 'v1.21.6', 'v1.20.12', 'v1.19.16', 'v1.18.20', 'v1.17.17', 'v1.16.15']
10+
java:
11+
- 8
12+
- 11
13+
kubernetes:
14+
- 'v1.21.6'
15+
- 'v1.22.17'
16+
- 'v1.23.15'
17+
- 'v1.24.9'
18+
- 'v1.25.5'
1219

1320
steps:
1421
- uses: actions/checkout@v2
@@ -23,20 +30,27 @@ jobs:
2330
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
2431
restore-keys: ${{ runner.os }}-m2
2532
- name: Setup Minikube
26-
uses: manusa/actions-setup-minikube@v2.3.0
33+
uses: manusa/actions-setup-minikube@v2.7.2
2734
with:
28-
minikube version: 'v1.16.0'
35+
minikube version: 'v1.28.0'
2936
kubernetes version: ${{ matrix.kubernetes }}
37+
github token: ${{ secrets.GITHUB_TOKEN }}
3038
- name: Setup Docker
3139
run: sudo apt-get -qq -y install conntrack socat ; nohup socat TCP-LISTEN:2375,reuseaddr,fork UNIX-CONNECT:/var/run/docker.sock &
3240
- name: Setup Docker Swarm
3341
run: docker swarm init
3442
- name: Pull Image
3543
run: docker pull openanalytics/shinyproxy-demo:latest
44+
- name: Run redis
45+
run: docker run -d -p 6379:6379 redis
3646
- name: Build with Maven
3747
run: mvn -B -U clean install -DskipTests
3848
- name: Copy Artifact
3949
run: cp target/containerproxy-*-exec.jar target/containerproxy-app-recovery.jar
50+
- name: debug
51+
run: |
52+
docker ps -a
53+
kubectl get pod -A
4054
- name: Run Tests
4155
run: mvn -B test
4256

@@ -52,4 +66,3 @@ jobs:
5266
with:
5367
name: dependency-check-report
5468
path: target/dependency-check-report.html
55-

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ logs
55
.idea
66
*.iml
77
*.log
8+
.project
9+
.classpath
10+
.settings

.project

Lines changed: 0 additions & 23 deletions
This file was deleted.

.settings/org.eclipse.core.resources.prefs

Lines changed: 0 additions & 6 deletions
This file was deleted.

.settings/org.eclipse.jdt.core.prefs

Lines changed: 0 additions & 16 deletions
This file was deleted.

.settings/org.eclipse.m2e.core.prefs

Lines changed: 0 additions & 4 deletions
This file was deleted.

LICENSE_HEADER

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ContainerProxy
22

3-
Copyright (C) 2016-2021 Open Analytics
3+
Copyright (C) 2016-2023 Open Analytics
44

55
===========================================================================
66

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ It is the engine that powers a.o. [ShinyProxy](https://shinyproxy.io) but can be
1818

1919
Learn more at https://containerproxy.io (in progress)
2020

21-
#### (c) Copyright Open Analytics NV, 2017-2021 - Apache License 2.0
21+
#### (c) Copyright Open Analytics NV, 2017-2023 - Apache License 2.0
2222

2323
## Building from source
2424

0 commit comments

Comments
 (0)