Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change docker-compose to docker compose #106

Merged
merged 1 commit into from
May 22, 2024
Merged

Change docker-compose to docker compose #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions docker/docker-files/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3'

services:
db:
image: postgres
Expand Down
6 changes: 3 additions & 3 deletions release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker-clean.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
docker compose -f ${DOCKER_COMPOSE} --project-name arlaspersist down -v
2 changes: 1 addition & 1 deletion scripts/docker-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Loading