Fix types; add uwsgi config; add env vars

This commit is contained in:
Devon Mackay 2018-08-07 11:42:51 -04:00
parent f17fe77e4d
commit 2eeb492c5c

View File

@ -23,10 +23,15 @@ spec:
containers: containers:
- name: atst - name: atst
image: registry.atat.codes:443/atst-prod:c06b0f6 image: registry.atat.codes:443/atst-prod:c06b0f6
envFrom:
- configMapRef:
name: atst-envvars
volumeMounts: volumeMounts:
- name: atst-config - name: atst-config
mountPath: "/opt/atat" mountPath: "/opt/atat/atst"
- name: uswgi-socket-dir - name: uwsgi-config
mountPath: "/opt/atat/atst"
- name: uwsgi-socket-dir
mountPath: "/var/run/uwsgi" mountPath: "/var/run/uwsgi"
- name: atst-nginx - name: atst-nginx
image: nginx:alpine image: nginx:alpine
@ -44,7 +49,7 @@ spec:
mountPath: "/etc/ssl" mountPath: "/etc/ssl"
- name: nginx-htpasswd - name: nginx-htpasswd
mountPath: "/etc/nginx" mountPath: "/etc/nginx"
- name: uswgi-socket-dir - name: uwsgi-socket-dir
mountPath: "/var/run/uwsgi" mountPath: "/var/run/uwsgi"
imagePullSecrets: imagePullSecrets:
- name: regcred - name: regcred
@ -86,7 +91,14 @@ spec:
- key: httpasswd - key: httpasswd
path: .htpasswd path: .htpasswd
mode: 0640 mode: 0640
- name: uswgi-socket-dir - name: uwsgi-config
configMap:
name: atst-config
items:
- key: uwsgi-config
path: uwsgi-config.ini
mode: 0644
- name: uwsgi-socket-dir
emptyDir: emptyDir:
medium: Memory medium: Memory
--- ---