diff --git a/etp-core/README.md b/etp-core/README.md index 5ce4a1a7f..2551f69d8 100644 --- a/etp-core/README.md +++ b/etp-core/README.md @@ -37,9 +37,8 @@ Remember to follow the [Docker postinstall](https://docs.docker.com/install/linux/linux-postinstall/) -guide. Then logout and login. -Docker-compose is also required: - -https://docs.docker.com/compose/install/ +Docker-compose used to be required, but nowadays Docker includes equivalent +functionality directly in the compose plugin. ### Clojure + CLI Tools diff --git a/etp-core/docker/docker-compose.yml b/etp-core/docker/docker-compose.yml index e274756df..1182149e7 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 a68f4c648..6d15fdc1e 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