Skip to content

Commit

Permalink
Update argocli Dockerfile and make cli-image part of release
Browse files Browse the repository at this point in the history
  • Loading branch information
jessesuen committed May 25, 2018
1 parent d35a1e6 commit 289000c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
5 changes: 2 additions & 3 deletions Dockerfile-cli
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FROM debian:9.4

COPY dist/argo /bin/
FROM alpine:3.7

COPY dist/argo-linux-amd64 /bin/argo
ENTRYPOINT [ "/bin/argo" ]
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ controller:
go build -v -i -ldflags '${LDFLAGS}' -o ${DIST_DIR}/workflow-controller ./cmd/workflow-controller

.PHONY: cli-image
cli-image: cli
docker build -t $(IMAGE_PREFIX)cli:$(IMAGE_TAG) -f Dockerfile-cli .
@if [ "$(DOCKER_PUSH)" = "true" ] ; then docker push $(IMAGE_PREFIX)cli:$(IMAGE_TAG) ; fi
cli-image: cli-linux
docker build -t $(IMAGE_PREFIX)argocli:$(IMAGE_TAG) -f Dockerfile-cli .
@if [ "$(DOCKER_PUSH)" = "true" ] ; then docker push $(IMAGE_PREFIX)argocli:$(IMAGE_TAG) ; fi

.PHONY: controller-linux
controller-linux: builder
Expand Down Expand Up @@ -151,4 +151,4 @@ release-precheck:
@if [ -z "$(GIT_TAG)" ]; then echo 'commit must be tagged to perform release' ; exit 1; fi

.PHONY: release
release: release-precheck controller-image cli-darwin cli-linux executor-image
release: release-precheck controller-image cli-darwin cli-linux executor-image cli-image

0 comments on commit 289000c

Please sign in to comment.