Skip to content

Commit de02704

Browse files
author
Adam McCartney
committed
Merge branch 'devel' into main (release v0.0.4)
Candidate for v0.0.4 release. + Shell script wrappers for deployment working (include ingress). + Helm chart deployment working (no ingress). + Database persistence issues resolved. Resolves #5, #6.
2 parents bd99c44 + b24f56f commit de02704

4 files changed

Lines changed: 30 additions & 8 deletions

File tree

deployments/pacman-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
name: pacman
1818
spec:
1919
containers:
20-
- image: ghcr.io/austriandatalab/pacman:latest
20+
- image: ghcr.io/austriandatalab/pacman:v0.0.4
2121
name: pacman
2222
ports:
2323
- containerPort: 8080

helm/templates/mongo-deployment.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ spec:
4949
- name: mongo-db
5050
persistentVolumeClaim:
5151
claimName: mongo-storage
52+
securityContext:
53+
runAsNonRoot: true
54+
runAsUser: 1001
55+
fsGroup: 1001
5256
containers:
5357
- name: mongo
5458
image: "{{ .Values.mongo.image.repository }}:{{ .Values.mongo.image.tag | default .Chart.AppVersion }}"
@@ -73,11 +77,28 @@ spec:
7377
secretKeyRef:
7478
key: database-user
7579
name: {{ .Release.Name }}-mongo-auth
80+
- name: ALLOW_EMPTY_PASSWORD
81+
value: "no"
82+
- name: MONGODB_SYSTEM_LOG_VERBOSITY
83+
value: "0"
84+
- name: MONGODB_DISABLE_SYSTEM_LOG
85+
value: "no"
86+
- name: MONGODB_DISABLE_JAVASCRIPT
87+
value: "no"
88+
- name: MONGODB_ENABLE_JOURNAL
89+
value: "yes"
90+
- name: MONGODB_PORT_NUMBER
91+
value: "27017"
92+
- name: MONGODB_ENABLE_IPV6
93+
value: "no"
94+
- name: MONGODB_ENABLE_DIRECTORY_PER_DB
95+
value: "no"
7696
ports:
7797
- name: mongo
7898
containerPort: 27017
7999
volumeMounts:
80100
- name: mongo-db
101+
subPath: mongodb
81102
mountPath: /bitnami/mongodb/
82103
readinessProbe:
83104
exec:
@@ -87,3 +108,4 @@ spec:
87108
- -c
88109
- mongo 127.0.0.1:27017/$MONGODB_DATABASE -u $MONGODB_USERNAME -p $MONGODB_PASSWORD
89110
--eval="quit()"
111+

helm/templates/pacman-deployment.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ spec:
3434
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
3535
imagePullPolicy: {{ .Values.image.pullPolicy }}
3636
ports:
37-
- name: http
38-
containerPort: 8080
39-
protocol: TCP
37+
- name: http-server
38+
containerPort: 8080
39+
protocol: TCP
4040
livenessProbe:
4141
httpGet:
4242
path: /
43-
port: http
43+
port: 8080
4444
readinessProbe:
4545
httpGet:
4646
path: /
47-
port: http
47+
port: 8080
4848
env:
4949
- name: MONGO_SERVICE_HOST
5050
value: mongo

helm/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
replicaCount: 1
66

77
image:
8-
repository: mbwali/pacman # adlsregistrysbx.azurecr.io/tutorials/pacman
8+
repository: ghcr.io/austriandatalab/pacman
99
pullPolicy: Always
1010
# Overrides the image tag whose default is the chart appVersion.
11-
tag: "latest"
11+
tag: "v0.0.4"
1212

1313
imagePullSecrets: []
1414
nameOverride: ""

0 commit comments

Comments
 (0)