diff --git a/.helm/ecamp3/templates/api_deployment.yaml b/.helm/ecamp3/templates/api_deployment.yaml index f37d636607..a2bc663b59 100644 --- a/.helm/ecamp3/templates/api_deployment.yaml +++ b/.helm/ecamp3/templates/api_deployment.yaml @@ -31,7 +31,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} enableServiceLinks: false containers: - - name: name: {{ .Chart.Name }}-api + - name: {{ .Chart.Name }}-api {{/* Define the api container as a template, so it can be reused in other places */}} {{- define "api.container" }} securityContext: @@ -151,7 +151,7 @@ spec: exec: command: ["/bin/sh", "-c", "/bin/sleep 1; kill -QUIT 1"] {{- end }} - {{- template "api.phpContainer" . }} + {{- template "api.container" . }} resources: {{- toYaml .Values.api.resources | nindent 12 }} readinessProbe: diff --git a/.helm/ecamp3/templates/hook_db_migrate.yaml b/.helm/ecamp3/templates/hook_db_migrate.yaml index 685ea6b10b..23e8696815 100644 --- a/.helm/ecamp3/templates/hook_db_migrate.yaml +++ b/.helm/ecamp3/templates/hook_db_migrate.yaml @@ -21,7 +21,7 @@ spec: restartPolicy: Never containers: - name: db-migrate-job - {{ template "api.phpContainer" . }} + {{ template "api.container" . }} command: ["migrate-database"] volumes: - name: php-socket diff --git a/.vscode/launch.json b/.vscode/launch.json index 59a1fa179e..d41e061217 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,7 +12,7 @@ "port": 9003, "log": true, "pathMappings": { - "/srv/api": "${workspaceRoot}/api" + "/app": "${workspaceRoot}/api" } }, { diff --git a/api/.vscode/launch.json b/api/.vscode/launch.json index 2e00728428..ee03f1c99b 100644 --- a/api/.vscode/launch.json +++ b/api/.vscode/launch.json @@ -12,7 +12,7 @@ "port": 9003, "log": true, "pathMappings": { - "/srv/api": "${workspaceRoot}" + "/app": "${workspaceRoot}" } }, {