|
|
@@ -9,14 +9,18 @@ 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}
|
|
|
|
|
|
-.PHONY: docker-build docker-push
|
|
|
+.PHONY: docker-build podman-build docker-push
|
|
|
|
|
|
docker-build:
|
|
|
git diff --exit-code
|
|
|
git diff --staged --exit-code
|
|
|
- sudo docker build -t "${DOCKER_IMAGE_NAME}:${DOCKER_TAG}" .
|
|
|
+ sudo docker build --tag="${DOCKER_IMAGE_NAME}:${DOCKER_TAG}" .
|
|
|
+
|
|
|
+podman-build:
|
|
|
+ # --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}" .
|
|
|
|
|
|
docker-push: docker-build
|
|
|
sudo docker push "${DOCKER_IMAGE_NAME}:${DOCKER_TAG}"
|
|
|
- sleep 4 # wait for repo digest
|
|
|
@echo git tag --sign --message '$(shell sudo docker image inspect --format '{{join .RepoDigests "\n"}}' "${DOCKER_IMAGE_NAME}:${DOCKER_TAG}")' docker/${DOCKER_TAG} $(shell git rev-parse HEAD)
|
