diff --git a/Makefile b/Makefile index e44edc8..52f44b9 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ help: @printf "$$(grep -hE '^\S+:.*##' $(MAKEFILE_LIST) | sed -e 's/:.*##\s*/:/' -e 's/^\(.\+\):\(.*\)/\\x1b[36m\1\\x1b[m:\2/' | column -c2 -t -s :)\n" build: ## Build for publishing - docker build --pull -t $(IMAGE_NAME):latest . + docker build --pull -t $(IMAGE_NAME):$(TAG) . build-local: ## Builds with local users UID and GID docker build --build-arg FTP_UID=$(shell id -u) --build-arg FTP_GID=$(shell id -g) -t $(IMAGE_NAME):$(TAG) . @@ -37,13 +37,7 @@ run-ssl: env vsftpd.pem @docker kill ${ID} push: ## Pushes the docker image to hub.docker.com - # Don't --pull here, we don't want any last minute upsteam changes - docker build -t $(IMAGE_NAME):$(TAG) . - docker tag $(IMAGE_NAME):$(TAG) $(IMAGE_NAME):latest docker push $(IMAGE_NAME):$(TAG) - docker push $(IMAGE_NAME):latest clean: ## Remove built images - docker rmi $(IMAGE_NAME):latest docker rmi $(IMAGE_NAME):$(TAG) -