Use docker compose in actions

Author: culka

README.md

@@ -95,19 +95,19 @@ set -euo pipefail
 curl https://raw.githubusercontent.com/HSLdevcom/jore4-tools/main/docker/download-docker-bundle.sh | bash
 
 # start up some dependency services (and build on-demand) in the background
-docker-compose -f ./docker/docker-compose.yml up -d jore4-testdb jore4-hasura jore4-auth
+docker compose -f ./docker/docker-compose.yml up -d jore4-testdb jore4-hasura jore4-auth
 
 # start up some dependency services with some overrides (e.g. pinned docker image versions) in a docker-compose.custom.yml file and build on demand (if using own repo's Dockerfile too)
-docker-compose -f ./docker/docker-compose.yml -f ./docker/docker-compose.custom.yml up --build jore4-testdb jore4-hasura jore4-auth
+docker compose -f ./docker/docker-compose.yml -f ./docker/docker-compose.custom.yml up --build jore4-testdb jore4-hasura jore4-auth
 
-# more info on docker-compose up command: https://docs.docker.com/engine/reference/commandline/compose_up/
+# more info on docker compose up command: https://docs.docker.com/reference/cli/docker/compose/up/
 ```
 
 To overwrite some values in the generic docker-compose config, you could use
-[docker-compose overrides](https://docs.docker.com/compose/extends/#multiple-compose-files)
+[docker compose overrides](https://docs.docker.com/compose/extends/#multiple-compose-files)
 
 To use your local repository version of the docker image instead of the e2e version, you could use
-[docker-compose local build](https://docs.docker.com/compose/compose-file/compose-file-v3/#build)
+[docker compose local build](https://docs.docker.com/compose/compose-file/compose-file-v3/#build)
 
 To run your service locally e.g. in Maven and then point services within the docker-compose network
 to use this natively running service, you could use

github-actions/run-ci/action.yml

@@ -116,7 +116,7 @@ runs:
       uses: HSLdevcom/jore4-tools/github-actions/extract-metadata@extract-metadata-v1
 
     - name: Start e2e env
-      uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v5
+      uses: HSLdevcom/jore4-tools/github-actions/setup-e2e-environment@setup-e2e-environment-v6
       with:
         ui_version: "${{ inputs.ui_version }}"
         cypress_version: "${{ inputs.cypress_version }}"

github-actions/setup-e2e-environment/action.yml

@@ -124,7 +124,7 @@ runs:
         TIMETABLESAPI_DOCKER_IMAGE: ${{ inputs.timetablesapi_version }}
         TIAMAT_DOCKER_IMAGE: ${{ inputs.tiamat_version }}
       run: |
-        docker-compose -f ${{ github.workspace }}/docker/docker-compose.yml ${{ inputs.custom_docker_compose != '' && format('-f {0}', inputs.custom_docker_compose) || '' }} up -d
+        docker compose -f ${{ github.workspace }}/docker/docker-compose.yml ${{ inputs.custom_docker_compose != '' && format('-f {0}', inputs.custom_docker_compose) || '' }} up -d
       shell: bash
 
     - name: Show which versions of the docker images are spun up