From 83f9bc5e1314c32422d4030763853e76fd56290c Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Thu, 5 Jan 2023 13:30:07 +0100 Subject: CI: Support Podman as an alternative to Docker Podman-compose (can be aliased to docker-compose now) does not have the exact same options. We move the compose file to the root to support podman. This is also better because users can just execute docker-compose in the root. --- ci/startcompose.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'ci/startcompose.sh') diff --git a/ci/startcompose.sh b/ci/startcompose.sh index 5f0338f..e65fa86 100755 --- a/ci/startcompose.sh +++ b/ci/startcompose.sh @@ -13,9 +13,14 @@ fi # Get absolute path to current directory this script is in SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +pushd "$SCRIPT_DIR"/.. + # Create self-signed certificate -mkdir -p "$SCRIPT_DIR"/docker/selfsigned -"$SCRIPT_DIR"/docker/createcert.sh +mkdir -p ci/docker/selfsigned +./ci/docker/createcert.sh + +# Up the containers and abort on exit. Also rebuild the necessary steps if there are changes +# You can symlink docker-compose to podman-compose to use Podman +docker-compose up --build --force-recreate --abort-on-container-exit -# Get the parent directory to get the root directory -docker-compose --file ci/docker/docker-compose.yml --project-directory "$SCRIPT_DIR"/.. up --build --force-recreate --abort-on-container-exit +popd -- cgit v1.2.3