Răsfoiți Sursa

added makefile to support image building, pushing & tagging

https://github.com/fphammerle/docker-onion-service/blob/3e418cf3a801c56a783f77a2b15da30c1dc91b08/Makefile
Fabian Peter Hammerle 3 ani în urmă
părinte
comite
573651762e
2 a modificat fișierele cu 25 adăugiri și 1 ștergeri
  1. 1 1
      Dockerfile
  2. 24 0
      Makefile

+ 1 - 1
Dockerfile

@@ -1,7 +1,7 @@
 FROM alpine:3.11 as download
 RUN apk add --no-cache git
 USER nobody
-# 0.2.200
+# 0.2.200 (update Makefile)
 ARG MONITOR_VERSION=1deec402b9b6323a964381819b199300259bb584
 RUN git clone https://github.com/andrewjfreyer/monitor /tmp/monitor
 WORKDIR /tmp/monitor

+ 24 - 0
Makefile

@@ -0,0 +1,24 @@
+# sync with https://github.com/fphammerle/docker-onion-service/blob/master/Makefile
+
+DOCKER_IMAGE_NAME := docker.io/fphammerle/andrewjfreyer-mqtt-bluetooth-presence-monitor
+DOCKER_TAG_VERSION := $(shell git describe --match=v* --abbrev=0 --dirty | sed -e 's/^v//')
+# https://github.com/andrewjfreyer/monitor/blob/1deec402b9b6323a964381819b199300259bb58/monitor.sh#L28
+MONITOR_VERSION := 0.2.200
+ARCH := $(shell arch)
+DOCKER_TAG_ARCH_SUFFIX_aarch64 := arm64
+DOCKER_TAG_ARCH_SUFFIX_armv6l := armv6
+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}-monitor${MONITOR_VERSION}-${DOCKER_TAG_ARCH_SUFFIX}
+
+.PHONY: docker-build docker-push
+
+docker-build:
+	git diff --exit-code
+	git diff --staged --exit-code
+	sudo docker build -t "${DOCKER_IMAGE_NAME}:${DOCKER_TAG}" .
+
+docker-push: docker-build
+	sudo docker push "${DOCKER_IMAGE_NAME}:${DOCKER_TAG}"
+	@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)