From e237fedec75412bfe7af05f579b3034c5ee8ae2c Mon Sep 17 00:00:00 2001 From: andig Date: Mon, 26 Jul 2021 08:20:36 +0200 Subject: [PATCH] Revert #1242 --- Makefile | 6 +++--- docker/tmpl.Dockerfile | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 650f46db9..a11220f93 100644 --- a/Makefile +++ b/Makefile @@ -67,17 +67,17 @@ docker: publish-testing: @echo Version: $(VERSION) $(BUILD_DATE) - EVCC_VERSION=testing seihon publish --dry-run=false --template docker/tmpl.Dockerfile --base-runtime-image alpine:$(ALPINE_VERSION) \ + seihon publish --dry-run=false --template docker/tmpl.Dockerfile --base-runtime-image alpine:$(ALPINE_VERSION) \ --image-name $(DOCKER_IMAGE) -v "testing" --targets=$(TARGETS) publish-latest: @echo Version: $(VERSION) $(BUILD_DATE) - EVCC_VERSION=latest seihon publish --dry-run=false --template docker/tmpl.Dockerfile --base-runtime-image alpine:$(ALPINE_VERSION) \ + seihon publish --dry-run=false --template docker/tmpl.Dockerfile --base-runtime-image alpine:$(ALPINE_VERSION) \ --image-name $(DOCKER_IMAGE) -v "latest" --targets=$(TARGETS) publish-images: @echo Version: $(VERSION) $(BUILD_DATE) - EVCC_VERSION=$(VERSION) seihon publish --dry-run=false --template docker/tmpl.Dockerfile --base-runtime-image alpine:$(ALPINE_VERSION) \ + seihon publish --dry-run=false --template docker/tmpl.Dockerfile --base-runtime-image alpine:$(ALPINE_VERSION) \ --image-name $(DOCKER_IMAGE) -v "latest" -v "$(TAG_NAME)" --targets=$(TARGETS) prepare-image: diff --git a/docker/tmpl.Dockerfile b/docker/tmpl.Dockerfile index cb55485d6..2877c8d2c 100644 --- a/docker/tmpl.Dockerfile +++ b/docker/tmpl.Dockerfile @@ -50,9 +50,6 @@ RUN GOARCH={{ .GoARCH }} GOARM={{ .GoARM }} make build # STEP 3 build a small image including module support FROM {{ .RuntimeImage }} -ARG BUILD_VERSION={{ env "EVCC_VERSION" }} -LABEL io.hass.version=${BUILD_VERSION} - WORKDIR /app ENV TZ=Europe/Berlin