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

Merge pull request #5875 from gsiv/fix/caddy-builddev

Browse Source 
Update Makefiles for Caddy
This commit is contained in:
Emanuel Schütze 2021-02-08 18:01:57 +01:00 committed by GitHub
commit 8e98966db2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -1,5 +1,5 @@
build-dev: build-dev:
make -C haproxy build-dev make -C caddy build-dev
git submodule foreach 'make build-dev' git submodule foreach 'make build-dev'
docker-compose -f docker/docker-compose.dev.yml build docker-compose -f docker/docker-compose.dev.yml build
@ -9,9 +9,6 @@ run-dev: | build-dev
stop-dev: stop-dev:
docker-compose -f docker/docker-compose.dev.yml down docker-compose -f docker/docker-compose.dev.yml down
reload-haproxy:
docker-compose -f docker/docker-compose.dev.yml kill -s HUP haproxy
get-server-shell: get-server-shell:
docker-compose -f docker/docker-compose.dev.yml run server bash docker-compose -f docker/docker-compose.dev.yml run server bash

2
caddy/Makefile Normal file
View File

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