From b96b0f26ee2db2962e5e41376ae07d2b2bc06522 Mon Sep 17 00:00:00 2001 From: g0dsCookie Date: Mon, 18 Feb 2019 07:55:51 +0100 Subject: [PATCH] Fixed Docker and Makefile --- Dockerfile | 4 ---- Makefile | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 67b8eb1..c3a6b87 100644 --- 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 index 816ad0a..1500f7a 100644 --- 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: