From d5c380f477f2913effd632cf58aff287062bf593 Mon Sep 17 00:00:00 2001 From: Malfurious Date: Fri, 18 Aug 2023 12:40:45 -0400 Subject: acid: Make docker compose YML file configurable Facilitate deployments using alternate docker-compose.yml files, or projects which simply use a different filename for the configuration. This setting populates the `docker compose -f` option. Signed-off-by: Malfurious --- acid/cyche-build | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'acid/cyche-build') diff --git a/acid/cyche-build b/acid/cyche-build index f37c22b..8363f60 100755 --- a/acid/cyche-build +++ b/acid/cyche-build @@ -1,8 +1,9 @@ #!/bin/bash -e -# cyche-build [--self] +# cyche-build [--self] # -# (Re)build and deploy docker services using the files associated with . +# (Re)build and deploy the service using the docker-compose configuration +# in (usually, docker-compose.yml). # # In the typical case, this is a straightforward process and `docker compose up` # can properly recreate/start containers for the guest service. However, when @@ -24,7 +25,7 @@ cd "/services/$1" -if [ "$3" == "--self" ]; then +if [ "$4" == "--self" ]; then prev=$(cat '.git/previous_slug') [ -n "$prev" ] && prev="--project-name $prev" @@ -32,20 +33,20 @@ if [ "$3" == "--self" ]; then next="--project-name $slug" fi -docker compose $next pull -docker compose $next build \ +docker compose $next --file "$2" pull +docker compose $next --file "$2" build \ --force-rm \ --no-cache \ --pull -docker compose $next up \ +docker compose $next --file "$2" up \ --detach \ --remove-orphans \ --force-recreate -echo "$2" >.git/previous_hash +echo "$3" >.git/previous_hash -if [ "$3" == "--self" ]; then +if [ "$4" == "--self" ]; then echo "$slug" >.git/previous_slug - docker compose down - docker compose $prev down + docker compose --file "$2" down + docker compose $prev --file "$2" down fi -- cgit v1.2.3