diff --git a/.gitignore b/.gitignore index 2f9284fe1..71572ed17 100644 --- a/.gitignore +++ b/.gitignore @@ -74,6 +74,7 @@ cypress.json ## Deployment # Docker build artifacts +/docker/docker-compose.yml *-version.txt # secrets docker/secrets/*.env diff --git a/docker/build.sh b/docker/build.sh index b988c9723..cd60a72bb 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -1,4 +1,7 @@ #!/bin/bash ../server/build.sh -t openslides/openslides-server:latest ../client/build.sh -t openslides/openslides-client:latest + +[[ -f docker-compose.yml ]] || m4 < docker-compose.yml.m4 > docker-compose.yml + docker-compose build