diff --git a/.github/actions/in-container/action.yml b/.github/actions/in-container/action.yml index eec1d4544..c8e9b23c4 100644 --- a/.github/actions/in-container/action.yml +++ b/.github/actions/in-container/action.yml @@ -8,7 +8,7 @@ inputs: description: 'shell to run command on inside docker' default: 'bash --noprofile --norc -eo pipefail' app: - description: 'docker-compose app to run command in' + description: 'docker compose app to run command in' required: true default: 'web' use_dev_image: @@ -19,7 +19,7 @@ runs: using: "composite" steps: - - name: Build image from docker-compose + - name: Build image from docker compose if: ${{ inputs.use_dev_image == 'false' }} uses: ./.github/actions/cached-build with: @@ -35,7 +35,7 @@ runs: composeFiles="-f docker-compose.yml" fi shellCommands='$@' - echo "docker-compose $composeFiles run --volume /home/runner:/home/runner/ ${{ inputs.app }} ${{ inputs.shell }} $shellCommands" > ${{ github.action_path }}/docker_command.sh + echo "docker compose $composeFiles run --volume /home/runner:/home/runner/ ${{ inputs.app }} ${{ inputs.shell }} $shellCommands" > ${{ github.action_path }}/docker_command.sh echo "${{ github.action_path }}" >> $GITHUB_PATH env: USE_DEV_IMAGE: ${{ inputs.use_dev_image}} diff --git a/script/dev-command b/script/dev-command index b84a645b3..b6289f44c 100755 --- a/script/dev-command +++ b/script/dev-command @@ -22,7 +22,7 @@ if [ "$INSIDE_DOCKER" == 1 ] ; then elif [ "$DEVENV" == "docker" ] ; then # not inside container but should be :-( # run the command inside the container - PREFIX="docker-compose exec web" + PREFIX="docker compose exec web" else # not inside container and don’t need to be :-) # run command in virtualenv with poetry diff --git a/script/server b/script/server index 5237d21c1..494571c43 100755 --- a/script/server +++ b/script/server @@ -15,11 +15,11 @@ case "$ACTION" in source .env if [ "$DEVENV" == "docker" ] ; then echo "==> Removing any stopped or crashed containers..." - docker-compose rm + docker compose rm echo "==> Removing node_modules volume if present..." docker volume rm noiseworks_node_modules || true echo "==> Starting development environment, hit ^C to stop..." - docker-compose up + docker compose up else echo "==> Starting development server..." script/server --development