Skip to content
This repository has been archived by the owner on May 15, 2020. It is now read-only.

Commit

Permalink
FIX - Correct Makefile
Browse files Browse the repository at this point in the history
This was actually my fault since I tried to merge
different Makefiles and I missed some crucial
differences.
  • Loading branch information
Michiel Holtkamp committed Feb 5, 2019
1 parent 2be2e88 commit 81be15b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,18 @@ docker/build/%:
docker build -t $(DOCKER_REPOSITORY)/$(IMAGE):$* .

docker/tag/%:
docker tag $(DOCKER_REPOSITORY)/$(IMAGE) $(REPOSITORY)/$(IMAGE):$*
docker tag $(DOCKER_REPOSITORY)/$(IMAGE) $(DOCKER_REPOSITORY)/$(IMAGE):$*

docker/push/%:
docker push $(DOCKER_REPOSITORY)/$(IMAGE):$*

docker/%: docker/build
docker run --rm -v $(PWD):$(PWD) -w $(PWD) $(DOCKER_REPOSITORY)/$(IMAGE) make $*

docker/publish/%: docker/build
docker/publish: docker/build
docker run --rm -v $(PWD):$(PWD) -w $(PWD) \
-e tag=$* -e TWINE_PASSWORD=$(TWINE_PASSWORD) -e TWINE_USERNAME=$(TWINE_USERNAME) \
$(REPOSITORY)/$(IMAGE) make publish
-e tag=$(TAG) -e TWINE_PASSWORD=$(TWINE_PASSWORD) -e TWINE_USERNAME=$(TWINE_USERNAME) \
$(DOCKER_REPOSITORY)/$(IMAGE) make publish


# ********** Tests **********
Expand Down

0 comments on commit 81be15b

Please sign in to comment.