Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge docker files #350

Merged
merged 5 commits into from
Nov 4, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ services:
- docker

before_install:
- docker build -t amber-spec -f spec/Dockerfile .
- docker build -t amber-spec .

script:
- docker-compose -f spec/docker-compose.yml run spec
- docker-compose run spec

notifications:
webhooks:
Expand Down
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ ADD . /app/user
RUN crystal deps

CMD ["crystal", "spec"]

12 changes: 10 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ version: '2'
services:
spec:
build: .
command: 'bash -c "cd /app/user && crystal spec"'
image: amber-spec
working_dir: /app/user
tmpfs: /app/testing
environment:
REDIS_URL: 'redis://redis:6379'
AMBER_ENV: test
depends_on:
- redis

redis:
image: redis:3.2-alpine
command: redis-server
9 changes: 0 additions & 9 deletions spec/Dockerfile

This file was deleted.

16 changes: 0 additions & 16 deletions spec/docker-compose.yml

This file was deleted.