Merge pull request #617 from ericchiang/dev-aci-path

*: build aci at the correct path including version, OS, and arch
This commit is contained in:
Eric Chiang 2016-10-14 14:40:14 -07:00 committed by GitHub
commit 3e94e65b68

View File

@ -71,13 +71,12 @@ _output/images/library-alpine-3.4.aci:
@docker2aci docker://alpine:3.4 @docker2aci docker://alpine:3.4
@mv library-alpine-3.4.aci _output/images/library-alpine-3.4.aci @mv library-alpine-3.4.aci _output/images/library-alpine-3.4.aci
_output/images/dex.aci: clean-release _output/bin/dex _output/images/library-alpine-3.4.aci .PHONY: aci
aci: clean-release _output/bin/dex _output/images/library-alpine-3.4.aci
# Using acbuild to build a application container image. # Using acbuild to build a application container image.
@sudo ./scripts/build-aci ./_output/images/library-alpine-3.4.aci @sudo ./scripts/build-aci ./_output/images/library-alpine-3.4.aci
@sudo chown $(user):$(group) _output/images/dex.aci @sudo chown $(user):$(group) _output/images/dex.aci
@mv _output/images/dex.aci _output/images/dex-$(VERSION)-linux-amd64.aci
.PHONY: aci
aci: _output/images/dex.aci
.PHONY: docker-image .PHONY: docker-image
docker-image: clean-release _output/bin/dex docker-image: clean-release _output/bin/dex