move gitup actions etc to use docker compose

.github/actions/cached-build/action.yml

@@ -63,7 +63,7 @@ runs:
   - name: Build and tag relevant app from docker-compose
     shell: bash
     run: |
-      docker-compose -f  ${{ inputs.docker_compose_file }} build ${{ inputs.docker_compose_file_app }}
+      docker compose -f  ${{ inputs.docker_compose_file }} build ${{ inputs.docker_compose_file_app }}
       docker tag "$IMAGE_NAME" "$REGISTRY/$IMAGE_NAME"
       for val in $TAGS; do
         docker tag "$IMAGE_NAME" "$val"

.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}}

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

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