Fixed Docker and Makefile

g0dsCookie · Feb 18, 2019 · b96b0f2 · b96b0f2
1 parent 34c4d6b
commit b96b0f2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,13 +4,9 @@ ARG MAINTAINER="g0dscookie@cookieprojects.de"
 ARG DESCRIPTION="Simple HTTP ldap auth daemon"
 
 ARG VERSION
-ARG BUILD
-ARG BUILD_DATE
 
 LABEL maintainer="${MAINTAINER}" \
       version="${VERSION}" \
-      build="${BUILD}" \
-      buildDate="${BUILD_DATE}" \
       description="${DESCRIPTION}"
 
 RUN set -eu \

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ PATCH	?= 1
 
 TAG	= g0dscookie/ldapauthd
 TAGLIST = -t ${TAG}:${MAJOR} -t ${TAG}:${MAJOR}.${MINOR} -t ${TAG}:${MAJOR}.${MINOR}.${PATCH}
-BUILDARGS = --build-arg MAJOR=${MAJOR} --build-arg MINOR=${MINOR} --build-arg PATCH=${PATCH}
+BUILDARGS = --build-arg VERSION=${MAJOR}.${MINOR}.${PATCH}
 
 .PHONY: nothing
 nothing: