Commit 5e40af5a authored by Robin Tissot's avatar Robin Tissot
Browse files

Merge branch 'develop'

parents 8e89660f ab9a8176
...@@ -46,6 +46,7 @@ services: ...@@ -46,6 +46,7 @@ services:
### and uncomment this block and the port 443 ### and uncomment this block and the port 443
# volumes: # volumes:
# - ${PWD}/nginx/ssl.conf:/etc/nginx/conf.d/nginx.conf # - ${PWD}/nginx/ssl.conf:/etc/nginx/conf.d/nginx.conf
# - ${PWD}/nginx/ssl_certificates.conf:/etc/nginx/conf.d/ssl_certificates.conf
# - ${PWD}/nginx/certs/:/etc/certs/ # - ${PWD}/nginx/certs/:/etc/certs/
flower: flower:
...@@ -115,6 +116,9 @@ services: ...@@ -115,6 +116,9 @@ services:
# memory: 15g # memory: 15g
# reservations: # reservations:
# memory: 1g # memory: 1g
# devices:
# - capabilities:
# - gpu
# shm_size: '3gb' # shm_size: '3gb'
# runtime: nvidia # runtime: nvidia
......
FROM nginx:1.15.0-alpine FROM nginx:1.15.0-alpine
RUN rm /etc/nginx/conf.d/default.conf RUN rm /etc/nginx/conf.d/default.conf
COPY ssl_certificates.conf* /etc/nginx/conf.d/
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment