Skip to content

Commit

Permalink
Merge branch 'trunk' of github.com:diced/zipline into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
diced committed Jun 5, 2022
2 parents be95233 + b26fef3 commit 181833d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
5 changes: 3 additions & 2 deletions docker-compose.arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ version: '3'
services:
postgres:
image: postgres
environment:
restart: always
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
- POSTGRES_DATABASE=postgres
volumes:
volumes:
- pg_data:/var/lib/postgresql/data
healthcheck:
test: ['CMD-SHELL', 'pg_isready -U postgres']
Expand Down
7 changes: 4 additions & 3 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ version: '3'
services:
postgres:
image: postgres
environment:
restart: always
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
- POSTGRES_DATABASE=postgres
volumes:
volumes:
- pg_data:/var/lib/postgresql/data
healthcheck:
test: ['CMD-SHELL', 'pg_isready -U postgres']
Expand All @@ -21,7 +22,7 @@ services:
ports:
- '3000:3000'
restart: unless-stopped
environment:
environment:
- SECURE=false
- SECRET=changethis
- HOST=0.0.0.0
Expand Down
9 changes: 5 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ version: '3'
services:
postgres:
image: postgres
environment:
restart: always
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
- POSTGRES_DATABASE=postgres
volumes:
volumes:
- pg_data:/var/lib/postgresql/data
healthcheck:
test: ['CMD-SHELL', 'pg_isready -U postgres']
Expand All @@ -18,8 +19,8 @@ services:
image: ghcr.io/diced/zipline/zipline:trunk
ports:
- '3000:3000'
restart: unless-stopped
environment:
restart: always
environment:
- SECURE=false
- SECRET=changethis
- HOST=0.0.0.0
Expand Down

0 comments on commit 181833d

Please sign in to comment.