updating docker-compose and fixing docker-compose files

Makefile

@@ -50,13 +50,13 @@ test:
 # Builds a docker image, starts it up with a postgres container, waits for a successful response from the survey service
 # /info endpoint, then runs unit tests and integration tests against the services in docker.
 integration-test: docker
-	docker-compose -f compose-integration-tests.yml down
-	docker-compose -f compose-integration-tests.yml up -d
+	docker compose -f compose-integration-tests.yml down
+	docker compose -f compose-integration-tests.yml up -d
 	./wait_for_startup_integration_tests.sh ||\
-	(docker-compose -f compose-integration-tests.yml down && exit 1)
+	(docker compose -f compose-integration-tests.yml down && exit 1)
 	go test --tags=integration -race -coverprofile=coverage.txt -covermode=atomic github.com/ONSdigital/rm-survey-service/models ||\
-	(docker-compose -f compose-integration-tests.yml down && exit 1)
-	docker-compose -f compose-integration-tests.yml down
+	(docker compose -f compose-integration-tests.yml down && exit 1)
+	docker compose -f compose-integration-tests.yml down
 
 # Remove the build directory tree.
 clean:

README.md

@@ -56,13 +56,13 @@ Once the app is running you should call the app with blank http auth values. Thi
 To start Docker containers for both PostgreSQL and the Survey service, run:
 
 ```
-docker-compose up -d
+docker compose up -d
 ```
 
 To stop and remove the two Docker containers, run:
 
 ```
-docker-compose down
+docker compose down
 ```
 
 ## Testing

compose-integration-tests.yml

@@ -1,21 +1,22 @@
-database:
-  container_name: postgres-survey-it
-  image: postgres:9.6-alpine
-  ports:
-   - "15432:5432"
-  environment:
-  - POSTGRES_DB=postgres
-  - POSTGRES_USER=postgres
-  - POSTGRES_PASSWORD=password
+services:
+  database:
+    container_name: postgres-survey-it
+    image: postgres:9.6-alpine
+    ports:
+     - "15432:5432"
+    environment:
+    - POSTGRES_DB=postgres
+    - POSTGRES_USER=postgres
+    - POSTGRES_PASSWORD=password
 
-survey:
-  container_name: surveysvc-it
-  image: sdcplatform/surveysvc
-  ports:
-   - "9090:8080"
-  links:
-   - database
-  environment:
-  - DATABASE_URL=postgres://postgres:password@postgres-survey-it:5432/postgres?sslmode=disable
-  - security_user_name=admin
-  - security_user_password=secret
+  survey:
+    container_name: surveysvc-it
+    image: sdcplatform/surveysvc
+    ports:
+     - "9090:8080"
+    links:
+     - database
+    environment:
+    - DATABASE_URL=postgres://postgres:password@postgres-survey-it:5432/postgres?sslmode=disable
+    - security_user_name=admin
+    - security_user_password=secret

docker-compose.yml

@@ -1,21 +1,22 @@
-database:
-  container_name: postgres
-  image: postgres:9.6-alpine
-  ports:
-   - "5432:5432"
-  environment:
-  - POSTGRES_DB=postgres
-  - POSTGRES_USER=postgres
-  - POSTGRES_PASSWORD=password
+services:
+  database:
+    container_name: postgres
+    image: postgres:9.6-alpine
+    ports:
+     - "5432:5432"
+    environment:
+    - POSTGRES_DB=postgres
+    - POSTGRES_USER=postgres
+    - POSTGRES_PASSWORD=password
 
-survey:
-  container_name: surveysvc
-  image: eu.gcr.io/ons-rasrmbs-management/survey
-  ports:
-   - "8080:8080"
-  links:
-   - database
-  environment:
-  - DATABASE_URL=postgres://postgres:password@database/postgres?sslmode=disable
-  - security_user_name=admin
-  - security_user_password=secret
+  survey:
+    container_name: surveysvc
+    image: eu.gcr.io/ons-rasrmbs-management/survey
+    ports:
+     - "8080:8080"
+    links:
+     - database
+    environment:
+    - DATABASE_URL=postgres://postgres:password@database/postgres?sslmode=disable
+    - security_user_name=admin
+    - security_user_password=secret