Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
csandanov committed Mar 29, 2018
2 parents 9ae78a4 + c5ac85d commit a9d063a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include .env
default: up

up:
@echo "Starting up containers for for $(PROJECT_NAME)..."
@echo "Starting up containers for $(PROJECT_NAME)..."
docker-compose pull --parallel
docker-compose up -d --remove-orphans

Expand All @@ -23,4 +23,4 @@ ps:
@docker ps --filter name='$(PROJECT_NAME)*'

shell:
docker exec -ti $(shell docker ps --filter name='$(PROJECT_NAME)_php' --format "{{ .ID }}") sh
docker exec -ti $(shell docker ps --filter name='$(PROJECT_NAME)_php' --format "{{ .ID }}") sh

0 comments on commit a9d063a

Please sign in to comment.