|
@@ -1,7 +1,7 @@
|
|
|
|
|
|
|
|
|
|
IMAGE_NAME = docker.io/fphammerle/systemctl-mqtt
|
|
IMAGE_NAME = docker.io/fphammerle/systemctl-mqtt
|
|
-BUILD_VERSION = $(shell git describe --match=v* --dirty | sed -e 's/^v//')
|
|
+PROJECT_VERSION = $(shell git describe --match=v* --dirty | sed -e 's/^v//')
|
|
ARCH = $(shell arch)
|
|
ARCH = $(shell arch)
|
|
|
|
|
|
|
|
|
|
@@ -10,17 +10,17 @@ IMAGE_TAG_ARCH_armv6l = armv6
|
|
IMAGE_TAG_ARCH_armv7l = armv7
|
|
IMAGE_TAG_ARCH_armv7l = armv7
|
|
IMAGE_TAG_ARCH_x86_64 = amd64
|
|
IMAGE_TAG_ARCH_x86_64 = amd64
|
|
IMAGE_TAG_ARCH = ${IMAGE_TAG_ARCH_${ARCH}}
|
|
IMAGE_TAG_ARCH = ${IMAGE_TAG_ARCH_${ARCH}}
|
|
-IMAGE_TAG = ${BUILD_VERSION}-${IMAGE_TAG_ARCH}
|
|
+IMAGE_TAG = ${PROJECT_VERSION}-${IMAGE_TAG_ARCH}
|
|
|
|
|
|
.PHONY: docker-build podman-build docker-push
|
|
.PHONY: docker-build podman-build docker-push
|
|
|
|
|
|
docker-build:
|
|
docker-build:
|
|
- sudo docker build -t "${IMAGE_NAME}:${IMAGE_TAG}" .
|
|
+ sudo docker build --tag="${IMAGE_NAME}:${IMAGE_TAG}" .
|
|
|
|
|
|
podman-build:
|
|
podman-build:
|
|
|
|
|
|
|
|
|
|
- podman build --format=docker -t "${IMAGE_NAME}:${IMAGE_TAG}" .
|
|
+ podman build --format=docker --tag="${IMAGE_NAME}:${IMAGE_TAG}" .
|
|
|
|
|
|
docker-push: docker-build
|
|
docker-push: docker-build
|
|
sudo docker push "${IMAGE_NAME}:${IMAGE_TAG}"
|
|
sudo docker push "${IMAGE_NAME}:${IMAGE_TAG}"
|