public_git
/
unpoller_unpoller
mirror of https://github.com/unpoller/unpoller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add iteration

This commit is contained in:
David Newhall II 2019-07-08 12:24:31 -07:00
parent 2143f54a74
commit 7243601049
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -268,7 +268,7 @@ docker:
docker build -f init/docker/Dockerfile \ docker build -f init/docker/Dockerfile \
--build-arg "BUILD_DATE=${DATE}" \ --build-arg "BUILD_DATE=${DATE}" \
--build-arg "COMMIT=${COMMIT}" \ --build-arg "COMMIT=${COMMIT}" \
--build-arg "VERSION=${VERSION}" \ --build-arg "VERSION=${VERSION}-${ITERATION}" \
--tag $(DHUSER)/$(BINARY):local . --tag $(DHUSER)/$(BINARY):local .
# Build an environment that can be packaged for linux. # Build an environment that can be packaged for linux.

3
init/docker/hooks/build
View File

@ -10,6 +10,7 @@ set -e -o pipefail
VERSION=$(git tag -l --merged | tail -n1 | tr -d v) # 1.2.3 VERSION=$(git tag -l --merged | tail -n1 | tr -d v) # 1.2.3
DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)
COMMIT=$(git rev-parse --short HEAD) COMMIT=$(git rev-parse --short HEAD)
ITERATION=$(git rev-list --count --all)
# Build each configured image from Docker Cloud. # Build each configured image from Docker Cloud.
for build in $BUILDS; do for build in $BUILDS; do
@ -21,7 +22,7 @@ for build in $BUILDS; do
--build-arg "ARCH=${name}" \ --build-arg "ARCH=${name}" \
--build-arg "BUILD_DATE=${DATE}" \ --build-arg "BUILD_DATE=${DATE}" \
--build-arg "COMMIT=${COMMIT}" \ --build-arg "COMMIT=${COMMIT}" \
--build-arg "VERSION=${VERSION}" \ --build-arg "VERSION=${VERSION}-${ITERATION}" \
--tag "${IMAGE_NAME}_${os}_${name}" \ --tag "${IMAGE_NAME}_${os}_${name}" \
--file Dockerfile ../.. --file Dockerfile ../..
done done