Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,11 @@ ENV APP_VERSION=${APP_VERSION} \
APP_REVISION=${APP_REVISION}

ARG BOOKLORE_PORT=6060
ENV BOOKLORE_PORT=${BOOKLORE_PORT}
EXPOSE ${BOOKLORE_PORT}

HEALTHCHECK --interval=60s --timeout=10s --start-period=60s --retries=5 \
CMD wget -q --spider http://localhost:${BOOKLORE_PORT}/api/v1/healthcheck
Comment thread
imnotjames marked this conversation as resolved.

ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
CMD ["java", "--enable-native-access=ALL-UNNAMED", "--enable-preview", "-jar", "/app/app.jar"]
17 changes: 11 additions & 6 deletions deploy/compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,17 @@ services:
- ./data:/app/data
- ./books:/books
- ./bookdrop:/bookdrop
healthcheck:
test: wget -q -O - http://localhost:6060/api/v1/healthcheck
interval: 60s
retries: 5
start_period: 60s
timeout: 10s
# Uncomment the block below if you need to override the defaults:
#healthcheck:
Comment thread
imnotjames marked this conversation as resolved.
# test: wget -q --spider http://localhost:6060/api/v1/healthcheck
# interval: 60s
# retries: 5
# start_period: 60s
# timeout: 10s
Comment thread
coderabbitai[bot] marked this conversation as resolved.
#
# Uncomment the block below if you want to disable healthchecks:
#healthcheck:
# disable: true
restart: unless-stopped

mariadb:
Expand Down
4 changes: 4 additions & 0 deletions deploy/helm/grimmory/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ spec:
name: {{ .Release.Name }}-mariadb
{{- end }}
key: mariadb-password
{{- with .Values.startupProbe }}
startupProbe:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.livenessProbe }}
livenessProbe:
{{- toYaml . | nindent 12 }}
Expand Down
21 changes: 18 additions & 3 deletions deploy/helm/grimmory/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,28 @@ resources: {}
# cpu: 100m
# memory: 128Mi

# # This is to setup the liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
# This is to setup the startup, liveness and readiness probes more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/
startupProbe:
httpGet:
path: /api/v1/healthcheck
port: http
failureThreshold: 5
periodSeconds: 30
Comment thread
imnotjames marked this conversation as resolved.
timeoutSeconds: 5
livenessProbe:
tcpSocket:
httpGet:
path: /api/v1/healthcheck
port: http
failureThreshold: 5
periodSeconds: 10
timeoutSeconds: 5
readinessProbe:
tcpSocket:
httpGet:
path: /api/v1/healthcheck
port: http
failureThreshold: 5
Comment thread
coderabbitai[bot] marked this conversation as resolved.
periodSeconds: 10
Comment thread
coderabbitai[bot] marked this conversation as resolved.
timeoutSeconds: 5
Comment thread
imnotjames marked this conversation as resolved.
# If you want to bring your own persistence (such as a hostPath),
# disable these and do so in extraVolumes/extraVolumeMounts
persistence:
Expand Down
2 changes: 1 addition & 1 deletion deploy/podman/quadlet/grimmory.container
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Environment=TZ=Etc/UTC
Secret=grimmory_db_pass,type=env,target=DATABASE_PASSWORD
Environment=DATABASE_URL=jdbc:mariadb://localhost:3306/grimmory
Environment=DATABASE_USERNAME=grimmory
HealthCmd=wget -q -O - http://localhost:6060/api/v1/healthcheck
HealthCmd=CMD-SHELL wget -q --spider http://localhost:${BOOKLORE_PORT:-6060}/api/v1/healthcheck
HealthInterval=1m
HealthRetries=5
HealthStartPeriod=1m
Expand Down
Loading