Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
cf3797fc
Commit
cf3797fc
authored
Feb 20, 2020
by
Dominik Hebeler
Browse files
Added Container
parent
5364a9bd
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Dockerfile
View file @
cf3797fc
...
...
@@ -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
Dockerfile.dev
View file @
cf3797fc
...
...
@@ -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
chart/templates/deployment.yaml
View file @
cf3797fc
...
...
@@ -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 -
}}
docker-compose.yml
View file @
cf3797fc
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment