Skip to content

Commit

Permalink
fixes #3061: use variable for docker image name (#3062)
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-garcia authored and webvictim committed Oct 8, 2019
1 parent 3035d27 commit af7ce33
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# for pre-releases, we use "1.0.0-beta.2" format
VERSION=4.2.0-alpha.1

DOCKER_IMAGE ?= quay.io/gravitational/teleport

# These are standard autotools variables, don't change them please
BUILDDIR ?= build
BINDIR ?= /usr/local/bin
Expand Down Expand Up @@ -318,12 +320,12 @@ install: build
.PHONY: image
image:
cp ./build.assets/charts/Dockerfile $(BUILDDIR)/
cd $(BUILDDIR) && docker build --no-cache . -t quay.io/gravitational/teleport:$(VERSION)
cd $(BUILDDIR) && docker build --no-cache . -t $(DOCKER_IMAGE):$(VERSION)
if [ -f e/Makefile ]; then $(MAKE) -C e image; fi

.PHONY: publish
publish:
docker push quay.io/gravitational/teleport:$(VERSION)
docker push $(DOCKER_IMAGE):$(VERSION)
if [ -f e/Makefile ]; then $(MAKE) -C e publish; fi

.PHONY: print-version
Expand Down

0 comments on commit af7ce33

Please sign in to comment.