DOC-1417 : moved command docker-compose to docker compose and removed…

… version (#208)

* DOC-1417 : moved command docker-compose to docker compose and removed version

* DOC-1417 : updated service version

README.md

@@ -99,7 +99,7 @@ or Helm [values file](./helm/ffc-pay-responses/values.yaml) if running Kubernete
 Docker Compose can be used to build the container image.  
 
 ```
-docker-compose build
+docker compose build
 ```
 
 The service will file watch application and test files so no need to rebuild the container unless a change to an npm package is made.

docker-compose.acceptance.yaml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   ffc-pay-processing:
       build: 

docker-compose.debug.yaml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   ffc-pay-processing:
     command: npm run start:debug

docker-compose.link.yaml

@@ -1,4 +1,3 @@
-version: '3.8'
 networks:
   default:
     external:

docker-compose.migrate.yaml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 x-common-migration: &common-migration
   POSTGRES_HOST: ${POSTGRES_HOST:-ffc-pay-processing-postgres}
   SCHEMA_ROLE: ${POSTGRES_SCHEMA_ROLE:-postgres}

docker-compose.override.yaml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 # This override file should be used when running this service in isolation
 # to provide dependencies and expose ports for local testing
 

docker-compose.test.debug.yaml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   ffc-pay-processing:
     command: npm run test:debug

docker-compose.test.watch.yaml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   ffc-pay-processing:
     command: >

docker-compose.test.yaml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 # This override file should be used when running automated tests so
 # that test output is saved to the host
 

docker-compose.yaml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   ffc-pay-processing:
     build:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ffc-pay-processing",
-  "version": "2.55.22",
+  "version": "2.55.23",
   "description": "Payment Hub processing service",
   "homepage": "https://github.com/DEFRA/ffc-pay-processing",
   "main": "app/index.js",

scripts/acceptance

@@ -9,22 +9,22 @@ cd "${projectRoot}"
   mkdir -p test-output
 
 # Guarantee clean environment
-docker-compose -f docker-compose.yaml -f docker-compose.migrate.yaml -p "${service}-acceptance-test" down -v
-docker-compose -f docker-compose.yaml -f docker-compose.acceptance.yaml -p "${service}-test-runner" down -v
+docker compose -f docker-compose.yaml -f docker-compose.migrate.yaml -p "${service}-acceptance-test" down -v
+docker compose -f docker-compose.yaml -f docker-compose.acceptance.yaml -p "${service}-test-runner" down -v
 
 # Ensure container images are up to date
-docker-compose -f docker-compose.yaml -f docker-compose.acceptance.yaml -p "${service}-acceptance-test" build
-docker-compose -f docker-compose.yaml -f docker-compose.migrate.yaml -p "${service}-acceptance-test" run --rm database-up
+docker compose -f docker-compose.yaml -f docker-compose.acceptance.yaml -p "${service}-acceptance-test" build
+docker compose -f docker-compose.yaml -f docker-compose.migrate.yaml -p "${service}-acceptance-test" run --rm database-up
 
 echo "============================================"
 echo "Running Pay Processing Acceptance Test(s)"
 echo "============================================"
 # Start container and run tests
-docker-compose -f docker-compose.yaml -f docker-compose.acceptance.yaml -p "${service}-acceptance-test" run --rm "${service}-test-runner" ${command}
+docker compose -f docker-compose.yaml -f docker-compose.acceptance.yaml -p "${service}-acceptance-test" run --rm "${service}-test-runner" ${command}
 
 echo "============================================"
 echo "Tear down environment"
 echo "============================================"
 # Tear down environment
-docker-compose -f docker-compose.yaml -f docker-compose.migrate.yaml -p "${service}-acceptance-test" down -v
-docker-compose -f docker-compose.yaml -f docker-compose.acceptance.yaml -p "${service}-test-runner" down -v
+docker compose -f docker-compose.yaml -f docker-compose.migrate.yaml -p "${service}-acceptance-test" down -v
+docker compose -f docker-compose.yaml -f docker-compose.acceptance.yaml -p "${service}-test-runner" down -v

scripts/start

@@ -9,12 +9,12 @@ projectRoot="$(a="/$0"; a=${a%/*}; a=${a:-.}; a=${a#/}/; cd "$a/.." || return; p
 
 cd "${projectRoot}"
 
-docker-compose down
-docker-compose -f docker-compose.migrate.yaml down
+docker compose down
+docker compose -f docker-compose.migrate.yaml down
 # Ensure container images are up to date
-docker-compose -f docker-compose.migrate.yaml run --rm database-up
+docker compose -f docker-compose.migrate.yaml run --rm database-up
 
-docker-compose \
+docker compose \
   -f docker-compose.yaml \
   -f docker-compose.override.yaml \
   -f docker-compose.link.yaml \

scripts/test

@@ -40,11 +40,11 @@ done
 
 compose() {
   if [ "${watch}" = "true" ]; then
-    docker-compose -f docker-compose.yaml -f docker-compose.test.yaml -f docker-compose.test.watch.yaml -p "${service}-test" $@
+    docker compose -f docker-compose.yaml -f docker-compose.test.yaml -f docker-compose.test.watch.yaml -p "${service}-test" $@
   elif [ "${debug}" = "true" ]; then
-    docker-compose -f docker-compose.yaml -f docker-compose.test.yaml -f docker-compose.test.watch.yaml -f docker-compose.test.debug.yaml -p "${service}-test" $@
+    docker compose -f docker-compose.yaml -f docker-compose.test.yaml -f docker-compose.test.watch.yaml -f docker-compose.test.debug.yaml -p "${service}-test" $@
   else
-    docker-compose -f docker-compose.yaml -f docker-compose.test.yaml -p "${service}-test" $@
+    docker compose -f docker-compose.yaml -f docker-compose.test.yaml -p "${service}-test" $@
   fi
 }
 
@@ -56,11 +56,11 @@ compose() {
 
   # Guarantee clean environment
   compose down -v
-  docker-compose -f docker-compose.migrate.yaml -p "${service}-test" down -v
+  docker compose -f docker-compose.migrate.yaml -p "${service}-test" down -v
 
   # Ensure container images are up to date
   compose build
-  docker-compose -f docker-compose.migrate.yaml -p "${service}-test" run --rm database-up
+  docker compose -f docker-compose.migrate.yaml -p "${service}-test" run --rm database-up
 
   # Run tests
   if [ "${debug}" = "true" ]; then