Skip to content

Commit

Permalink
Revert "Merge pull request #7 from solita/feature/etp-compose"
Browse files Browse the repository at this point in the history
This reverts commit 8c835d5, reversing
changes made to 826c3c5.

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
  • Loading branch information
muep committed Jan 3, 2024
1 parent 8c835d5 commit cd5c902
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions etp-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion etp-core/docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version: '3.7'
name: 'etp'

services:
db:
image: postgres:15.2-alpine
Expand Down
2 changes: 1 addition & 1 deletion etp-core/docker/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit cd5c902

Please sign in to comment.