From cf3797fca2332f95efd1ce7942479cb10184a9b1 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Thu, 20 Feb 2020 13:13:12 +0100
Subject: [PATCH] Added Container
---
Dockerfile | 2 +-
Dockerfile.dev | 2 +-
chart/templates/deployment.yaml | 42 ++++++++++++++++++++++++++++-----
docker-compose.yml | 2 +-
4 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 04c5500ec..ff6fefbec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,4 +68,4 @@ EXPOSE 80
CMD chown -R root:nginx storage/logs/metager bootstrap/cache && \
chmod -R g+w storage/logs/metager bootstrap/cache && \
crond -L /dev/stdout && \
- nginx
+ php-fpm7
diff --git a/Dockerfile.dev b/Dockerfile.dev
index d77c7769a..18748bf88 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -64,4 +64,4 @@ EXPOSE 80
CMD chown -R root:nginx storage/logs/metager bootstrap/cache && \
chmod -R g+w storage/logs/metager bootstrap/cache && \
crond -L /dev/stdout && \
- nginx
+ php-fpm7
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index 4c04ffc4b..539ea2aea 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -39,6 +39,42 @@ spec:
persistentVolumeClaim:
claimName: mglogs
containers:
+ # Main PHP-FPM Container
+ - name: {{ .Chart.Name }}-phpfpm
+ image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
+ {{- if .Values.application.secretName }}
+ envFrom:
+ - secretRef:
+ name: {{ .Values.application.secretName }}
+ {{- end }}
+ env:
+ - name: DATABASE_URL
+ value: {{ .Values.application.database_url | quote }}
+ - name: GITLAB_ENVIRONMENT_NAME
+ value: {{ .Values.gitlab.envName }}
+ - name: GITLAB_ENVIRONMENT_URL
+ value: {{ .Values.gitlab.envURL }}
+ ports:
+ - name: "{{ .Values.service.name }}-phpfpm"
+ containerPort: 9000
+ livenessProbe:
+ tcpSocket:
+ port: "{{ .Values.service.name }}-phpfpm"
+ initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+ timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
+ readinessProbe:
+ tcpSocket:
+ port: "{{ .Values.service.name }}-phpfpm"
+ initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+ timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
+ volumeMounts:
+ - name: mglogs-persistent-storage
+ mountPath: /html/storage/logs/metager
+ readOnly: false
+ resources:
+{{ toYaml .Values.resources | indent 12 }}
+ # Nginx Container
- name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -81,10 +117,4 @@ spec:
{{- end }}
initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
- volumeMounts:
- - name: mglogs-persistent-storage
- mountPath: /html/storage/logs/metager
- readOnly: false
- resources:
-{{ toYaml .Values.resources | indent 12 }}
{{- end -}}
diff --git a/docker-compose.yml b/docker-compose.yml
index 1b531769d..6a63508b5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,7 +43,6 @@ services:
context: .
dockerfile: Dockerfile.dev
image: metager:latest
- command: php-fpm7
working_dir: /html
volumes:
- .:/html
@@ -53,6 +52,7 @@ services:
restart: on-failure
image: metager:latest
working_dir: /html
+ command: nginx
volumes:
- .:/html
- ./config/nginx.conf:/etc/nginx/nginx.conf
--
GitLab