diff --git a/docker/docker-files/docker-compose.yml b/docker/docker-files/docker-compose.yml index bcee20a..930cb88 100644 --- a/docker/docker-files/docker-compose.yml +++ b/docker/docker-files/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3' - services: db: image: postgres diff --git a/release.sh b/release.sh index f6d1a5b..741b544 100755 --- a/release.sh +++ b/release.sh @@ -18,7 +18,7 @@ DOCKER_COMPOSE="${PROJECT_ROOT_DIRECTORY}/docker/docker-files/docker-compose.yml ######################################### function clean_docker { echo "===> Stop arlas-persistence-server stack" - docker-compose -f ${DOCKER_COMPOSE} --project-name arlaspersist down -v + docker compose -f ${DOCKER_COMPOSE} --project-name arlaspersist down -v } function clean_exit { @@ -175,7 +175,7 @@ fi ######################################### echo "=> Start arlas-persistence-server stack" -docker-compose -f ${DOCKER_COMPOSE} --project-name arlaspersist up -d --build +docker compose -f ${DOCKER_COMPOSE} --project-name arlaspersist up -d --build DOCKER_IP=$(docker-machine ip || echo "localhost") echo "=> Wait for arlas-persistence-server up and running" @@ -191,7 +191,7 @@ cp target/tmp/openapi.yaml openapi cp target/tmp/openapi.json openapi echo "=> Stop arlas-persistence-server stack" -docker-compose -f ${DOCKER_COMPOSE} --project-name arlaspersist down -v +docker compose -f ${DOCKER_COMPOSE} --project-name arlaspersist down -v echo "=> Generate API documentation" mkdir -p docs/api diff --git a/scripts/docker-clean.sh b/scripts/docker-clean.sh index 6b65f59..ee34149 100755 --- a/scripts/docker-clean.sh +++ b/scripts/docker-clean.sh @@ -12,4 +12,4 @@ function clean_exit { trap clean_exit EXIT echo "===> stop arlas-persistence-server stack" -docker-compose -f ${DOCKER_COMPOSE} --project-name arlaspersist down -v \ No newline at end of file +docker compose -f ${DOCKER_COMPOSE} --project-name arlaspersist down -v \ No newline at end of file diff --git a/scripts/docker-run.sh b/scripts/docker-run.sh index 91e8375..6a223f1 100755 --- a/scripts/docker-run.sh +++ b/scripts/docker-run.sh @@ -42,7 +42,7 @@ docker run --rm \ echo "arlas-persistence-server:${ARLAS_PERSISTENCE_SERVER_VERSION}" echo "===> start arlas-persistence-server stack" -docker-compose -f ${DOCKER_COMPOSE} --project-name arlaspersist up -d ${BUILD_OPTS} +docker compose -f ${DOCKER_COMPOSE} --project-name arlaspersist up -d ${BUILD_OPTS} echo "===> wait for arlas-persistence-server up and running" docker run --network arlaspersist_default --rm busybox sh -c 'i=1; until nc -w 2 arlas-persistence-server 9997; do if [ $i -lt 30 ]; then sleep 1; else break; fi; i=$(($i + 1)); done'