From ba4cafac279735c9a2586e05f3eb5dec27845e6f Mon Sep 17 00:00:00 2001 From: Fabian Peter Hammerle Date: Fri, 1 Jan 2021 17:40:10 +0100 Subject: [PATCH] make: add tor package version to image tag --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f2967a5..9c49a0b 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,11 @@ DOCKER_IMAGE_NAME := docker.io/fphammerle/tor-proxy DOCKER_TAG_VERSION := $(shell git describe --match=v* --dirty | sed -e 's/^v//') +TOR_PACKAGE_VERSION := $(shell grep -Po 'TOR_PACKAGE_VERSION=\K.+' Dockerfile | tr -d -) ARCH := $(shell arch) DOCKER_TAG_ARCH_SUFFIX_armv6l := armv6 DOCKER_TAG_ARCH_SUFFIX_x86_64 := amd64 DOCKER_TAG_ARCH_SUFFIX = ${DOCKER_TAG_ARCH_SUFFIX_${ARCH}} -DOCKER_TAG = ${DOCKER_TAG_VERSION}-${DOCKER_TAG_ARCH_SUFFIX} +DOCKER_TAG = ${DOCKER_TAG_VERSION}-tor${TOR_PACKAGE_VERSION}-${DOCKER_TAG_ARCH_SUFFIX} .PHONY: docker-build docker-push