Skip to content

Commit

Permalink
s/docker-compose/docker compose
Browse files Browse the repository at this point in the history
docker compose v1 has been deprecated by Github
actions/runner-images#9557
  • Loading branch information
rebkwok committed Aug 12, 2024
1 parent 72caedf commit a319670
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions docker/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ build env="dev": tmpdir
# ensure env files exist
test -f ../.env || cp ../dotenv-sample ../.env
touch docker-compose.env
touch docker compose.env

# enable modern docker build features
export DOCKER_BUILDKIT=1
Expand All @@ -40,7 +40,7 @@ build env="dev": tmpdir
export GITREF=$(git rev-parse --short HEAD)

# build the thing
docker-compose build --pull {{ env }}
docker compose build --pull {{ env }}

tmpdir:
#!/bin/bash
Expand All @@ -53,19 +53,19 @@ tmpdir:
# run tests in docker container
test *args: build
#!/bin/bash
docker-compose run --rm test {{ args }}
docker compose run --rm test {{ args }}

# run dev server in docker container
service: build
docker-compose up dev
docker compose up dev

# run command in dev container
run env="dev" *args="bash": build
docker-compose run --rm {{ env }} {{ args }}
docker compose run --rm {{ env }} {{ args }}

# exec command in existing dev container
exec *args="bash":
docker-compose exec dev {{ args }}
docker compose exec dev {{ args }}

clean:
#!/bin/bash
Expand Down Expand Up @@ -95,8 +95,8 @@ setup-ssh:

# enable using ssh to talk to docker on host
enable-ssh: setup-ssh
echo "DOCKER_HOST=ssh://$USER@$SSH_HOST" > docker-compose.env
echo "DOCKER_HOST=ssh://$USER@$SSH_HOST" > docker compose.env

# disable using ssh to talk to docker on host
disable-ssh:
rm docker-compose.env
rm docker compose.env

0 comments on commit a319670

Please sign in to comment.