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

Merge pull request #5877 from FinnStutzenstein/fixCaddyDevSetup

Browse Source 
fix Caddy dev setup
This commit is contained in:
Finn Stutzenstein 2021-02-10 07:55:12 +01:00 committed by GitHub
commit 7fffffb497
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
caddy/Dockerfile
View File

@ -1,3 +1,3 @@
FROM caddy:2.3.0-alpine FROM caddy:2.3.0-alpine
COPY Caddyfile /etc/caddy/ COPY Caddyfile /etc/caddy/Caddyfile

3
caddy/Dockerfile.dev Normal file
View File

@ -0,0 +1,3 @@
FROM caddy:2.3.0-alpine
COPY Caddyfile.dev /etc/caddy/Caddyfile

2
caddy/Makefile
View File

@ -1,2 +1,2 @@
build-dev: build-dev:
docker build -t os3-proxy-dev -f Dockerfile . docker build -t os3-proxy-dev -f Dockerfile.dev .

2
docker/build.sh
View File

@ -19,7 +19,7 @@ DOCKER_TAG="latest"
CONFIG="/etc/osinstancectl" CONFIG="/etc/osinstancectl"
OPTIONS=() OPTIONS=()
BUILT_IMAGES=() BUILT_IMAGES=()
DEFAULT_TARGETS=(server client haproxy autoupdate) DEFAULT_TARGETS=(server client proxy autoupdate)
usage() { usage() {
cat << EOF cat << EOF

2
docker/docker-compose.dev.yml
View File

@ -46,7 +46,7 @@ services:
image: redis:latest image: redis:latest
proxy: proxy:
image: caddy:2.3.0-alpine image: os3-proxy-dev
volumes: volumes:
- ../caddy/Caddyfile.dev:/etc/caddy/Caddyfile - ../caddy/Caddyfile.dev:/etc/caddy/Caddyfile
depends_on: depends_on: