Skip to content

Commit

Permalink
Update docker-compose for local dev and add some helpful dev tools
Browse files Browse the repository at this point in the history
  • Loading branch information
matteosb committed May 20, 2020
1 parent 1737c5a commit 75729e9
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 16 deletions.
8 changes: 8 additions & 0 deletions dev-tools/create-test-database
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
set -euo pipefail

docker-compose exec -T postgres psql -h localhost -p 5432 -U spoke spokedev <<EOF
CREATE DATABASE spoke_test;
CREATE USER spoke_test WITH PASSWORD 'spoke_test';
GRANT ALL PRIVILEGES ON DATABASE spoke_test TO spoke_test;
EOF
4 changes: 4 additions & 0 deletions dev-tools/psql
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
set -euo pipefail

docker-compose exec postgres psql -h localhost -p 5432 -U spoke spokedev "$@"
4 changes: 4 additions & 0 deletions dev-tools/redis-cli
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
set -euo pipefail

docker-compose exec redis redis-cli "$@"
19 changes: 3 additions & 16 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,15 @@ services:
POSTGRES_USER: spoke
volumes:
- postgres:/var/lib/postgresql/data
ports:
- 5432:5432
redis:
image: redis:alpine
restart: always
volumes:
- redis:/data
spoke:
image: spokeapp/spoke
build:
context: .
depends_on:
- postgres
- redis
env_file:
- ./.env
environment:
DATABASE_URL: postgres://spoke:spoke@postgres:5432/spokedev
REDIS_URL: redis://redis:6379
KNEX_MIGRATION_DIR: /spoke/build/server/migrations/
ports:
- 3000:3000
volumes:
- ./.env:/Spoke/.env
- 6379:6379
volumes:
postgres:
external: false
Expand Down

0 comments on commit 75729e9

Please sign in to comment.