move 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

@@ -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/build

@@ -10,5 +10,5 @@ export BUILD_COMMIT=$(git log -1 --pretty=%h)
 script/bootstrap
 
 docker build . -t mysocietyorg/caps:latest -t mysocietyorg/caps:${BUILD_COMMIT} --build-arg BUILD_COMMIT=${BUILD_COMMIT}
-docker-compose pull solr
-docker-compose pull postgres
+docker compose pull solr
+docker compose pull postgres

script/setup

@@ -11,7 +11,7 @@ set -e
 cd `dirname $0`/..
 
 echo "==> Cleaning up any lingering Docker development environments..."
-docker-compose down -v
+docker compose down -v
 
 echo "==> Removing any local data..."
 rm -fr media/
@@ -23,14 +23,14 @@ script/bootstrap
 
 # Start the local Docker environment in the background.
 echo "==> Starting development docker environment in the background..."
-docker-compose up -d
+docker compose up -d
 
 # Run the data import
 echo "==> Importing data..."
-docker-compose exec app script/update --all
+docker compose exec app script/update --all
 
 # Tear it all down
 echo "==> Stopping environment..."
-docker-compose stop
+docker compose stop
 
-echo '==> Done. You can now start an interactive environment by running `docker-compose up`'
+echo '==> Done. You can now start an interactive environment by running `docker compose up`'