Skip to content

Commit 202ba25

Browse files
birmbirm
authored
Merge pull request #179 from camicroscope/develop
For 3.9.8
2 parents cbfff4a + 8787f14 commit 202ba25

Some content is hidden

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

58 files changed

+2920
-7
lines changed

‎caMicroscope.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ services:
2727
- mongo
2828
back:
2929
build:
30-
context: "https://github.com/camicroscope/caracal.git#v3.9.7"
30+
context: "https://github.com/camicroscope/caracal.git#v3.9.8"
3131
args:
32-
viewer: "v3.9.6"
32+
viewer: "v3.9.8"
3333
depends_on:
3434
- "mongo"
3535
ports:
@@ -61,7 +61,7 @@ services:
6161
volumes:
6262
- ./images/:/images/
6363
loader:
64-
build: "https://github.com/camicroscope/SlideLoader.git#v3.9.4"
64+
build: "https://github.com/camicroscope/SlideLoader.git#v3.9.8"
6565
container_name: ca-load
6666
restart: always
6767
logging:

‎config/contentSecurityPolicy.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
],
4646
"frameSrc": [
4747
"'self'",
48-
"accounts.google.com"
48+
"accounts.google.com",
49+
"www.youtube-nocookie.com"
4950
]
5051
}

‎openshift/build_config/quip-back-img.yaml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
apiVersion: v1
2+
items:
3+
- apiVersion: image.openshift.io/v1
4+
kind: ImageStream
5+
metadata:
6+
annotations:
7+
openshift.io/generated-by: OpenShiftNewBuild
8+
labels:
9+
build: quip-back-img
10+
name: back
11+
spec:
12+
lookupPolicy:
13+
local: false
14+
- apiVersion: build.openshift.io/v1
15+
kind: BuildConfig
16+
metadata:
17+
annotations:
18+
openshift.io/generated-by: OpenShiftNewBuild
19+
labels:
20+
build: quip-back-img
21+
name: back
22+
spec:
23+
nodeSelector: null
24+
output:
25+
to:
26+
kind: ImageStreamTag
27+
name: back:latest
28+
postCommit: {}
29+
resources: {}
30+
source:
31+
git:
32+
ref: prism
33+
uri: https://github.com/SBU-BMI/caracal.git
34+
type: Git
35+
strategy:
36+
dockerStrategy:
37+
type: Docker
38+
kind: List
39+
metadata: {}

‎openshift/build_config/quip-featuredb-img.yaml

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
apiVersion: v1
2+
items:
3+
- apiVersion: image.openshift.io/v1
4+
kind: ImageStream
5+
metadata:
6+
annotations:
7+
openshift.io/generated-by: OpenShiftNewBuild
8+
labels:
9+
build: quip-featuredb-img
10+
name: featuredb
11+
spec:
12+
lookupPolicy:
13+
local: false
14+
- apiVersion: build.openshift.io/v1
15+
kind: BuildConfig
16+
metadata:
17+
annotations:
18+
openshift.io/generated-by: OpenShiftNewBuild
19+
labels:
20+
build: quip-featuredb-img
21+
name: featuredb
22+
spec:
23+
output:
24+
to:
25+
kind: ImageStreamTag
26+
name: featuredb:latest
27+
postCommit: {}
28+
resources: {}
29+
source:
30+
git:
31+
ref: prism
32+
uri: https://github.com/SBU-BMI/quip_featuredb.git
33+
type: Git
34+
strategy:
35+
dockerStrategy:
36+
type: Docker
37+
kind: List
38+
metadata: {}

‎openshift/build_config/quip-heatmaploader-img.yaml

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
apiVersion: v1
2+
items:
3+
- apiVersion: image.openshift.io/v1
4+
kind: ImageStream
5+
metadata:
6+
annotations:
7+
openshift.io/generated-by: OpenShiftNewBuild
8+
labels:
9+
build: quip-heatmaploader-img
10+
name: heatmaploader
11+
spec:
12+
lookupPolicy:
13+
local: false
14+
- apiVersion: build.openshift.io/v1
15+
kind: BuildConfig
16+
metadata:
17+
annotations:
18+
openshift.io/generated-by: OpenShiftNewBuild
19+
labels:
20+
build: quip-heatmaploader-img
21+
name: heatmaploader
22+
spec:
23+
output:
24+
to:
25+
kind: ImageStreamTag
26+
name: heatmaploader:latest
27+
postCommit: {}
28+
resources: {}
29+
source:
30+
git:
31+
ref: prism
32+
uri: https://github.com/SBU-BMI/uploadHeatmaps.git
33+
type: Git
34+
strategy:
35+
dockerStrategy:
36+
type: Docker
37+
kind: List
38+
metadata: {}

‎openshift/build_config/quip-iip-img.yaml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
apiVersion: v1
2+
items:
3+
- apiVersion: image.openshift.io/v1
4+
kind: ImageStream
5+
metadata:
6+
annotations:
7+
openshift.io/generated-by: OpenShiftNewBuild
8+
labels:
9+
build: quip-iip-img
10+
name: iip
11+
spec:
12+
lookupPolicy:
13+
local: false
14+
- apiVersion: build.openshift.io/v1
15+
kind: BuildConfig
16+
metadata:
17+
annotations:
18+
openshift.io/generated-by: OpenShiftNewBuild
19+
labels:
20+
build: quip-iip-img
21+
name: iip
22+
spec:
23+
output:
24+
to:
25+
kind: ImageStreamTag
26+
name: iip:latest
27+
postCommit: {}
28+
source:
29+
git:
30+
ref: prism
31+
uri: https://github.com/SBU-BMI/iipImage.git
32+
type: Git
33+
strategy:
34+
dockerStrategy:
35+
type: Docker
36+
kind: List
37+
metadata: {}

‎openshift/build_config/quip-imageloader-img.yaml

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
apiVersion: v1
2+
items:
3+
- apiVersion: image.openshift.io/v1
4+
kind: ImageStream
5+
metadata:
6+
annotations:
7+
openshift.io/generated-by: OpenShiftNewBuild
8+
labels:
9+
build: quip-imageloader-img
10+
name: imageloader
11+
spec:
12+
lookupPolicy:
13+
local: false
14+
- apiVersion: build.openshift.io/v1
15+
kind: BuildConfig
16+
metadata:
17+
annotations:
18+
openshift.io/generated-by: OpenShiftNewBuild
19+
labels:
20+
build: quip-imageloader-img
21+
name: imageloader
22+
spec:
23+
output:
24+
to:
25+
kind: ImageStreamTag
26+
name: imageloader:latest
27+
postCommit: {}
28+
resources: {}
29+
source:
30+
git:
31+
ref: prism
32+
uri: https://github.com/SBU-BMI/ImageLoader.git
33+
type: Git
34+
strategy:
35+
dockerStrategy:
36+
type: Docker
37+
kind: List
38+
metadata: {}

‎openshift/build_config/quip-pathdb-img.yaml

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
apiVersion: v1
2+
items:
3+
- apiVersion: image.openshift.io/v1
4+
kind: ImageStream
5+
metadata:
6+
annotations:
7+
openshift.io/generated-by: OpenShiftNewBuild
8+
labels:
9+
build: quip-pathdb-img
10+
name: pathdb
11+
spec:
12+
lookupPolicy:
13+
local: false
14+
- apiVersion: build.openshift.io/v1
15+
kind: BuildConfig
16+
metadata:
17+
annotations:
18+
openshift.io/generated-by: OpenShiftNewBuild
19+
labels:
20+
build: quip-pathdb-img
21+
name: pathdb
22+
spec:
23+
output:
24+
to:
25+
kind: ImageStreamTag
26+
name: pathdb:latest
27+
postCommit: {}
28+
resources: {}
29+
source:
30+
git:
31+
ref: prism
32+
uri: https://github.com/SBU-BMI/PathDB.git
33+
type: Git
34+
strategy:
35+
dockerStrategy:
36+
type: Docker
37+
kind: List
38+
metadata: {}

‎openshift/build_config/quip-segloader-img.yaml

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
apiVersion: v1
2+
items:
3+
- apiVersion: image.openshift.io/v1
4+
kind: ImageStream
5+
metadata:
6+
annotations:
7+
openshift.io/generated-by: OpenShiftNewBuild
8+
labels:
9+
build: quip-segloader-img
10+
name: segloader
11+
spec:
12+
lookupPolicy:
13+
local: false
14+
- apiVersion: build.openshift.io/v1
15+
kind: BuildConfig
16+
metadata:
17+
annotations:
18+
openshift.io/generated-by: OpenShiftNewBuild
19+
labels:
20+
build: quip-segloader-img
21+
name: segloader
22+
spec:
23+
output:
24+
to:
25+
kind: ImageStreamTag
26+
name: segloader:latest
27+
postCommit: {}
28+
resources: {}
29+
source:
30+
git:
31+
ref: prism
32+
uri: https://github.com/SBU-BMI/SegmentationLoader.git
33+
type: Git
34+
strategy:
35+
dockerStrategy:
36+
type: Docker
37+
kind: List
38+
metadata: {}

‎openshift/deployment/back-deployment.yaml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
annotations:
5+
kompose.cmd: kompose convert -f quip-pathdb.yml.PRISM -o openshift2
6+
kompose.version: 1.21.0 (992df58d8)
7+
creationTimestamp: null
8+
labels:
9+
io.kompose.service: back
10+
name: back
11+
spec:
12+
replicas: 1
13+
selector:
14+
matchLabels:
15+
io.kompose.service: back
16+
template:
17+
metadata:
18+
annotations:
19+
kompose.cmd: kompose convert -f quip-pathdb.yml.PRISM -o openshift2
20+
kompose.version: 1.21.0 (992df58d8)
21+
creationTimestamp: null
22+
labels:
23+
io.kompose.service: back
24+
spec:
25+
containers:
26+
- env:
27+
- name: DEFAULT_USER_TYPE
28+
value: Editor
29+
- name: DISABLE_SEC
30+
value: "true"
31+
- name: IIP_PATH
32+
value: http://ca-iip:8080/fcgi-bin/iipsrv.fcgi
33+
- name: JWK_URL
34+
value: https://www.googleapis.com/oauth2/v3/certs
35+
- name: MONGO_URI
36+
value: mongodb://ca-mongo
37+
image: back:latest
38+
imagePullPolicy: ""
39+
name: ca-security
40+
ports:
41+
- containerPort: 4010
42+
resources: {}
43+
volumeMounts:
44+
- mountPath: /root/src/keys/
45+
name: keys
46+
restartPolicy: Always
47+
serviceAccountName: ""
48+
volumes:
49+
- name: keys
50+
persistentVolumeClaim:
51+
claimName: keys
52+
status: {}

‎openshift/deployment/back-service.yaml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
annotations:
5+
kompose.cmd: kompose convert -f quip-pathdb.yml.PRISM -o openshift2
6+
kompose.version: 1.21.0 (992df58d8)
7+
creationTimestamp: null
8+
labels:
9+
io.kompose.service: back
10+
name: ca-security
11+
spec:
12+
ports:
13+
- name: "4010"
14+
port: 4010
15+
targetPort: 4010
16+
selector:
17+
io.kompose.service: back
18+
status:
19+
loadBalancer: {}

‎openshift/deployment/data-persistentvolumeclaim.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
apiVersion: v1
2+
kind: PersistentVolumeClaim
3+
metadata:
4+
creationTimestamp: null
5+
labels:
6+
io.kompose.service: data
7+
name: data
8+
spec:
9+
accessModes:
10+
- ReadWriteOnce
11+
resources:
12+
requests:
13+
storage: 50Gi
14+
status: {}

0 commit comments

Comments
 (0)