ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'update' into openslides4-dev

Browse Source
This commit is contained in:
FinnStutzenstein 2020-07-23 12:16:59 +02:00
commit e47b5fff17
No known key found for this signature in database
GPG Key ID: 9042F605C6324654
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

@ -46,11 +46,11 @@ services:
- cache - cache
env_file: services.env env_file: services.env
cache: cache:
image: redis:alpine image: redis:latest
# SHARED # SHARED
message-bus: message-bus:
image: redis:alpine image: redis:latest
# UPLINK # UPLINK
haproxy: haproxy:

2
haproxy/Dockerfile
View File

@ -1,4 +1,4 @@
FROM haproxy:2.0.8-alpine FROM haproxy
COPY src/haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg COPY src/haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg
COPY src/prod-haproxy.cfg /usr/local/etc/haproxy/prod-haproxy.cfg COPY src/prod-haproxy.cfg /usr/local/etc/haproxy/prod-haproxy.cfg
CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg", "-f", "/usr/local/etc/haproxy/prod-haproxy.cfg"] CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg", "-f", "/usr/local/etc/haproxy/prod-haproxy.cfg"]

2
haproxy/Dockerfile.dev
View File

@ -1,4 +1,4 @@
FROM haproxy:2.0.8-alpine FROM haproxy
COPY src/haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg COPY src/haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg
COPY src/dev-haproxy.cfg /usr/local/etc/haproxy/dev-haproxy.cfg COPY src/dev-haproxy.cfg /usr/local/etc/haproxy/dev-haproxy.cfg
CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg", "-f", "/usr/local/etc/haproxy/dev-haproxy.cfg"] CMD ["haproxy", "-f", "/usr/local/etc/haproxy/haproxy.cfg", "-f", "/usr/local/etc/haproxy/dev-haproxy.cfg"]