Skip to content

Commit

Permalink
ref(Makefile): refactor make dev-release
Browse files Browse the repository at this point in the history 
This allows us to run `make -C controller config` when we know that
the image is pushed onto the registry and we just need to tell the
cluster to use this image.
  • Loading branch information
Matthew Fisher committed Oct 9, 2014
1 parent 676da87 commit 8a5c0b0
Show file tree
Hide file tree
Showing 11 changed files with 59 additions and 13 deletions.
6 changes: 6 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ run: install start
dev-release:
@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) dev-release &&) echo done

push:
@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) push &&) echo done

set-image:
@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) set-image &&) echo done

release: check-registry
@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) release &&) echo done
@$(foreach C, $(CLIENTS), $(MAKE) -C $(C) release &&) echo done
Expand Down
6 changes: 5 additions & 1 deletion builder/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,13 @@ restart: stop start

run: install start

dev-release: check-registry check-deisctl
dev-release: push set-image

push: check-registry
docker tag $(IMAGE) $(DEV_IMAGE)
docker push $(DEV_IMAGE)

set-image: check-deisctl
deisctl config $(COMPONENT) set image=$(DEV_IMAGE)

release:
Expand Down
6 changes: 5 additions & 1 deletion cache/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,13 @@ restart: stop start

run: install start

dev-release: check-registry check-deisctl
dev-release: push set-image

push: check-registry
docker tag $(IMAGE) $(DEV_IMAGE)
docker push $(DEV_IMAGE)

set-image: check-deisctl
deisctl config $(COMPONENT) set image=$(DEV_IMAGE)

release:
Expand Down
6 changes: 5 additions & 1 deletion controller/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,13 @@ restart: stop start

run: install start

dev-release: check-registry check-deisctl
dev-release: push set-image

push: check-registry
docker tag $(IMAGE) $(DEV_IMAGE)
docker push $(DEV_IMAGE)

set-image: check-deisctl
deisctl config $(COMPONENT) set image=$(DEV_IMAGE)

release:
Expand Down
6 changes: 5 additions & 1 deletion database/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,13 @@ restart: stop start

run: install start

dev-release: check-registry check-deisctl
dev-release: push set-image

push: check-registry
docker tag $(IMAGE) $(DEV_IMAGE)
docker push $(DEV_IMAGE)

set-image: check-deisctl
deisctl config $(COMPONENT) set image=$(DEV_IMAGE)

release:
Expand Down
6 changes: 5 additions & 1 deletion logger/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,13 @@ restart: stop start

run: install start

dev-release: check-registry check-deisctl
dev-release: push set-image

push: check-registry
docker tag $(IMAGE) $(DEV_IMAGE)
docker push $(DEV_IMAGE)

set-image: check-deisctl
deisctl config $(COMPONENT) set image=$(DEV_IMAGE)

release:
Expand Down
6 changes: 5 additions & 1 deletion logspout/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,13 @@ restart: stop start

run: install start

dev-release: check-registry check-deisctl
dev-release: push set-image

push: check-registry
docker tag $(RELEASE_IMAGE) $(DEV_DOCKER_IMAGE)
docker push $(DEV_DOCKER_IMAGE)

set-image: check-deisctl
deisctl config $(COMPONENT) set image=$(DEV_DOCKER_IMAGE)

release:
Expand Down
6 changes: 5 additions & 1 deletion publisher/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,13 @@ full-clean: check-docker check-registry
install: check-deisctl
deisctl install publisher

dev-release: check-docker check-registry check-deisctl
dev-release: push set-image

push: check-registry
docker tag $(RELEASE_IMAGE) $(REMOTE_IMAGE)
docker push $(REMOTE_IMAGE)

set-image: check-deisctl
deisctl config publisher set image=$(REMOTE_IMAGE)

release: check-docker
Expand Down
6 changes: 5 additions & 1 deletion registry/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,13 @@ restart: stop start

run: install start

dev-release: check-registry check-deisctl
dev-release: push set-image

push: check-registry
docker tag $(IMAGE) $(DEV_IMAGE)
docker push $(DEV_IMAGE)

set-image: check-deisctl
deisctl config $(COMPONENT) set image=$(DEV_IMAGE)

release:
Expand Down
8 changes: 6 additions & 2 deletions router/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
build: check-docker
cd parent && docker build -t deis/binary-router .
docker cp `docker run -d deis/binary-router`:/nginx.tgz .
docker build -t $(IMAGE) .
docker build -t $(IMAGE) .
rm nginx.tgz

clean: check-docker check-registry
Expand All @@ -32,9 +32,13 @@ restart: stop start

run: install start

dev-release: check-registry check-deisctl
dev-release: push set-image

push: check-registry
docker tag $(IMAGE) $(DEV_IMAGE)
docker push $(DEV_IMAGE)

set-image: check-deisctl
deisctl config $(COMPONENT) set image=$(DEV_IMAGE)

release:
Expand Down
10 changes: 7 additions & 3 deletions store/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,19 @@ restart: stop start

run: install start

dev-release: check-registry check-deisctl
dev-release: push set-image

push: check-registry
docker tag $(DAEMON_IMAGE) $(DAEMON_DEV_IMAGE)
docker push $(DAEMON_DEV_IMAGE)
deisctl config store-daemon set image=$(DAEMON_DEV_IMAGE)
docker tag $(MONITOR_IMAGE) $(MONITOR_DEV_IMAGE)
docker push $(MONITOR_DEV_IMAGE)
deisctl config store-monitor set image=$(MONITOR_DEV_IMAGE)
docker tag $(GATEWAY_IMAGE) $(GATEWAY_DEV_IMAGE)
docker push $(GATEWAY_DEV_IMAGE)

set-image: check-deisctl
deisctl config store-daemon set image=$(DAEMON_DEV_IMAGE)
deisctl config store-monitor set image=$(MONITOR_DEV_IMAGE)
deisctl config store-gateway set image=$(GATEWAY_DEV_IMAGE)

release:
Expand Down

0 comments on commit 8a5c0b0

Please sign in to comment.