|
@@ -8,18 +8,22 @@ DOCKER_TAG_ARCH_SUFFIX_armv7l := armv7
|
|
|
DOCKER_TAG_ARCH_SUFFIX_x86_64 := amd64
|
|
|
DOCKER_TAG_ARCH_SUFFIX = ${DOCKER_TAG_ARCH_SUFFIX_${ARCH}}
|
|
|
DOCKER_TAG = ${DOCKER_TAG_VERSION}-tor${TOR_PACKAGE_VERSION}-${DOCKER_TAG_ARCH_SUFFIX}
|
|
|
+BUILD_PARAMS = --tag="${DOCKER_IMAGE_NAME}:${DOCKER_TAG}" \
|
|
|
+ --build-arg=REVISION="$(shell git rev-parse HEAD)"
|
|
|
|
|
|
.PHONY: docker-build podman-build docker-push
|
|
|
|
|
|
-docker-build:
|
|
|
+worktree-clean:
|
|
|
git diff --exit-code
|
|
|
git diff --staged --exit-code
|
|
|
- sudo docker build --tag="${DOCKER_IMAGE_NAME}:${DOCKER_TAG}" .
|
|
|
|
|
|
-podman-build:
|
|
|
+docker-build: worktree-clean
|
|
|
+ sudo docker build ${BUILD_PARAMS} .
|
|
|
+
|
|
|
+podman-build: worktree-clean
|
|
|
# --format=oci (default) not fully supported by hub.docker.com
|
|
|
# https://github.com/docker/hub-feedback/issues/1871#issuecomment-748924149
|
|
|
- podman build --format=docker --tag="${DOCKER_IMAGE_NAME}:${DOCKER_TAG}" .
|
|
|
+ podman build --format=docker ${BUILD_PARAMS} .
|
|
|
|
|
|
docker-push: docker-build
|
|
|
sudo docker push "${DOCKER_IMAGE_NAME}:${DOCKER_TAG}"
|