diff --git a/Dockerfile b/Dockerfile index 1fcad3a..f99cc53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,7 @@ ARG GHC_VERSION ARG CABAL_VERSION LABEL org.opencontainers.image.source=https://github.com/spex-lang/spex -LABEL org.opencontainers.image.description= - "The Spex specification language and toolkit static build image" +LABEL org.opencontainers.image.description="The Spex specification language and toolkit static build image" LABEL org.opencontainers.image.licenses=BSD-2-Clause # Install system dependencies needed for ghcup. diff --git a/Makefile b/Makefile index dfeb76f..4283aa6 100644 --- a/Makefile +++ b/Makefile @@ -268,7 +268,7 @@ GITHUB_EVENT_BEFORE =? origin/main DOCKERFILE_CHANGED := $(shell \ git diff --name-only "$(GITHUB_EVENT_AFTER)" "$(GITHUB_EVENT_BEFORE)" \ - | grep Dockerfile && echo true || echo false) + | grep --quiet "^Dockerfile$$" && echo true || echo false) .PHONY: pull-image build-image push-image @@ -277,9 +277,10 @@ pull-image: docker pull ghcr.io/spex-lang/spex-build:latest endif -build-image: Dockerfile +build-image: + echo "DOCKERFILE_CHANGED=$(DOCKERFILE_CHANGED)" ifeq ($(DOCKERFILE_CHANGED),true) - docker build --tag ghcr.io/spex-lang/spex-build:latest . + docker build --tag ghcr.io/spex-lang/spex-build:latest . endif push-image: