From 75f6c0b9792ac1b6d9139e4c723baaae2bd1028c Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Mon, 8 Jul 2019 12:24:31 -0700 Subject: [PATCH] add iteration --- core/poller/Makefile | 2 +- core/poller/init/docker/hooks/build | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/poller/Makefile b/core/poller/Makefile index b8ff7019..0eae85ef 100644 --- a/core/poller/Makefile +++ b/core/poller/Makefile @@ -268,7 +268,7 @@ docker: docker build -f init/docker/Dockerfile \ --build-arg "BUILD_DATE=${DATE}" \ --build-arg "COMMIT=${COMMIT}" \ - --build-arg "VERSION=${VERSION}" \ + --build-arg "VERSION=${VERSION}-${ITERATION}" \ --tag $(DHUSER)/$(BINARY):local . # Build an environment that can be packaged for linux. diff --git a/core/poller/init/docker/hooks/build b/core/poller/init/docker/hooks/build index a8ad7a84..8e15743b 100755 --- a/core/poller/init/docker/hooks/build +++ b/core/poller/init/docker/hooks/build @@ -10,6 +10,7 @@ set -e -o pipefail VERSION=$(git tag -l --merged | tail -n1 | tr -d v) # 1.2.3 DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) COMMIT=$(git rev-parse --short HEAD) +ITERATION=$(git rev-list --count --all) # Build each configured image from Docker Cloud. for build in $BUILDS; do @@ -21,7 +22,7 @@ for build in $BUILDS; do --build-arg "ARCH=${name}" \ --build-arg "BUILD_DATE=${DATE}" \ --build-arg "COMMIT=${COMMIT}" \ - --build-arg "VERSION=${VERSION}" \ + --build-arg "VERSION=${VERSION}-${ITERATION}" \ --tag "${IMAGE_NAME}_${os}_${name}" \ --file Dockerfile ../.. done