Skip to content

Commit

Permalink
Added docker-compose.dev.yml for adding maildev. Docker compose now s…
Browse files Browse the repository at this point in the history
…tarts demonized in production.
  • Loading branch information
SarahW91 committed Oct 20, 2021
1 parent 1db79f8 commit dd9c95f
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 29 deletions.
38 changes: 14 additions & 24 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
secret:
@echo "Generating a secret key..."
@docker-compose run --user "$(id -u):$(id -g)" app rails secret

install:
@echo "Installing Barcode Workflow Manager..."
@echo "Creating volumes..."
Expand All @@ -12,38 +16,24 @@ install:
@docker-compose run --user "$(id -u):$(id -g)" app rails assets:precompile

@echo "Starting Barcode Workflow Manager..."
@docker-compose up

update:
@echo "Removing Barcode Workflow Manager containers..."
@docker-compose rm -s -v -f

@echo "Getting updates..."
@git pull

@echo "Migrating database..."
@docker-compose run --user "$(id -u):$(id -g)" app rails db:migrate

@echo "Precompiling assets..."
@docker-compose run --user "$(id -u):$(id -g)" app rails assets:precompile
@docker-compose up -d

start:
@echo "Starting Barcode Workflow Manager..."
@docker-compose up
@docker-compose up -d

secret:
@echo "Generating a secret key..."
@docker-compose run --user "$(id -u):$(id -g)" app rails secret
stop:
@echo "Stopping Barcode Workflow Manager..."
@docker-compose down

remove:
@echo "Removing Barcode Workflow Manager containers..."
@docker-compose rm -s -v -f

restart: remove start

stop:
@echo "Stopping Barcode Workflow Manager..."
@docker-compose down

start:
start-dev:
@echo "Starting Barcode Workflow Manager..."
@docker-compose up
@docker-compose -f docker-compose.yml -f docker-compose.dev.yml up

restart-dev: remove start-dev
5 changes: 5 additions & 0 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
services:
maildev:
image: djfarrelly/maildev
ports:
- "1080:80"
5 changes: 0 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@ services:
ports:
- ${PORT}:${PORT}

maildev:
image: djfarrelly/maildev
ports:
- "1080:80"

volumes:
bwm-redis:
bwm-postgres:

0 comments on commit dd9c95f

Please sign in to comment.