Skip to content

Commit 31e6f7f

Browse files
committed
Replace docker-compose with docker compose
1 parent c448c73 commit 31e6f7f

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ jobs:
4242
echo
4343
echo Docker version
4444
docker --version
45-
docker-compose --version
4645
echo
4746
echo Env
4847
env

run

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
UI_PATH="source/SIL.AppBuilder.Portal.Frontend"
99
API_PATH="source/OptimaJet.DWKit.StarterApplication"
10-
COMPOSE="docker-compose -f deployment/development/docker-compose.yml --project-directory . -p appbuilder-portal"
10+
COMPOSE="docker compose -f deployment/development/docker-compose.yml --project-directory . -p appbuilder-portal"
1111
COMPOSE_SERVICES="db adminer api ui"
1212

13-
CI_COMPOSE="docker-compose -f deployment/ci/docker-compose.yml --project-directory . -p appbuilder-portal-ci"
13+
CI_COMPOSE="docker compose -f deployment/ci/docker-compose.yml --project-directory . -p appbuilder-portal-ci"
1414

1515
PSQL="PGPASSWORD=\$POSTGRES_PASSWORD psql -h localhost -U \$POSTGRES_USER"
1616

@@ -21,7 +21,7 @@ function runstuff {
2121
arguments=${@:2}
2222

2323
case $given_command in
24-
# docker-compose proxy
24+
# docker compose proxy
2525
dc) ${COMPOSE} $arguments;;
2626
up:build) ${COMPOSE} up --build $arguments ${COMPOSE_SERVICES} ;;
2727
up) ${COMPOSE} up $arguments ${COMPOSE_SERVICES} ;;
@@ -41,7 +41,7 @@ function runstuff {
4141
echo "on the host environment (use .env.dev files to make this simpler)"
4242
echo ""
4343
echo "why?"
44-
echo "because currently, docker-compose doesn't have a way to omit files / folders"
44+
echo "because currently, docker compose doesn't have a way to omit files / folders"
4545
echo "from volume mounts, so whenever dotnet watch would do a rebuild inside the"
4646
echo "docker environment, it would blow away all the host-dependencies that the"
4747
echo "editor was using for intellisense..."
@@ -253,13 +253,13 @@ function print_help {
253253
echo ""
254254
echo "Available Commands:"
255255
echo ""
256-
echo "dc : short for docker-compose"
256+
echo "dc : short for docker compose"
257257
echo "up:build"
258258
echo "up"
259259
echo "up:local:start : starts non-essential services in docker, and the api and ui services natively on the host machine"
260260
echo ""
261-
echo "bash : drop into a bash shell in a temporary docker-compose service"
262-
echo "restart : restart a specific docker-compose service"
261+
echo "bash : drop into a bash shell in a temporary docker compose service"
262+
echo "restart : restart a specific docker compose service"
263263
echo ""
264264
echo "bootstrap : runs initial scripts for project setup"
265265
echo "bootstrap:dwkit"

0 commit comments

Comments
 (0)