Skip to content
This repository has been archived by the owner on Dec 5, 2023. It is now read-only.

Commit

Permalink
Merge pull request #55 from stefanprodan/patch-1
Browse files Browse the repository at this point in the history
Skipping docker push for external PRs
  • Loading branch information
stefanprodan authored Sep 25, 2017
2 parents b5ec77e + 2d1b32b commit 013b519
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,12 @@ dockertravisbuild: build
cp -rf bin docker/user/
docker build -t $(NAME):$(TAG) -f docker/user/Dockerfile-release docker/user/
docker build -t $(DBNAME):$(TAG) -f docker/user-db/Dockerfile docker/user-db/
docker login -u $(DOCKER_USER) -p $(DOCKER_PASS)
scripts/push.sh

if [ -z "$(DOCKER_PASS)" ]; then \
echo "This is a build triggered by an external PR. Skipping docker push."; \
else \
docker login -u $(DOCKER_USER) -p $(DOCKER_PASS); \
scripts/push.sh; \
fi

mockservice:
docker run -d --name user-mock -h user-mock -v $(PWD)/apispec/mock.json:/data/db.json clue/json-server
Expand Down

0 comments on commit 013b519

Please sign in to comment.