From cd5c902ead09d58994dabeb1b10eab798d33012e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joonas=20Saraj=C3=A4rvi?= <joonas.sarajarvi@solita.fi>
Date: Wed, 3 Jan 2024 08:08:30 +0100
Subject: [PATCH] Revert "Merge pull request #7 from
 solita/feature/etp-compose"

This reverts commit 8c835d5ff1a50d9dad85c5d089cccb3de8e19fff, reversing
changes made to 826c3c52cea6c44601895d770133182db1e8a486.

Our AWS build pipeline does not yet have support for Docker Compose v2
which in turn means that the `name` directive is not available for
docker-compose.yml
---
 etp-core/README.md                 | 5 +++--
 etp-core/docker/docker-compose.yml | 2 +-
 etp-core/docker/start.sh           | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/etp-core/README.md b/etp-core/README.md
index 2551f69d8..5ce4a1a7f 100644
--- a/etp-core/README.md
+++ b/etp-core/README.md
@@ -37,8 +37,9 @@ Remember to follow the
 [Docker postinstall](https://docs.docker.com/install/linux/linux-postinstall/)
 -guide. Then logout and login.
 
-Docker-compose used to be required, but nowadays Docker includes equivalent
-functionality directly in the compose plugin.
+Docker-compose is also required:
+
+https://docs.docker.com/compose/install/
 
 ### Clojure + CLI Tools
 
diff --git a/etp-core/docker/docker-compose.yml b/etp-core/docker/docker-compose.yml
index 1182149e7..e274756df 100644
--- a/etp-core/docker/docker-compose.yml
+++ b/etp-core/docker/docker-compose.yml
@@ -1,5 +1,5 @@
 version: '3.7'
-name: 'etp'
+
 services:
   db:
     image: postgres:15.2-alpine
diff --git a/etp-core/docker/start.sh b/etp-core/docker/start.sh
index 6d15fdc1e..a68f4c648 100755
--- a/etp-core/docker/start.sh
+++ b/etp-core/docker/start.sh
@@ -5,7 +5,7 @@ cd "$(dirname "$0")"
 mkdir -p smtp/received-emails
 find sftp/ssh -iname "*_key" -exec chmod 600 {} \;
 
-docker compose up -d
+docker-compose up -d
 
 # Wait naively for PostgreSQL to start
 sleep 2