소스 검색

build v0.6.0 armv6 image

https://github.com/fphammerle/systemctl-mqtt/commit/12b2abb33b37bf5f5fb8d2f9a9787c64b232b5b9
Fabian Peter Hammerle 4 년 전
부모
커밋
1a00bd2449
2개의 변경된 파일3개의 추가작업 그리고 8개의 파일을 삭제
  1. 1 1
      Dockerfile
  2. 2 7
      Makefile

+ 1 - 1
Dockerfile

@@ -1,6 +1,6 @@
 # not using python:3.*-alpine cause glib-dev package depends on python3
 # https://pkgs.alpinelinux.org/package/v3.11/main/aarch64/glib-dev
-ARG BASE_IMAGE=docker.io/alpine:3.11
+ARG BASE_IMAGE=docker.io/arm32v6/alpine:3.11
 ARG SOURCE_DIR_PATH=/switchbot-mqtt
 ARG VIRTUALENV_PATH=$SOURCE_DIR_PATH/.venv
 

+ 2 - 7
Makefile

@@ -17,13 +17,8 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 DOCKER_IMAGE_NAME := docker.io/fphammerle/switchbot-mqtt
-DOCKER_TAG_VERSION := $(shell git describe --match=v* --dirty | sed -e 's/^v//')
-ARCH := $(shell arch)
-DOCKER_TAG_ARCH_SUFFIX_aarch64 := arm64
-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_VERSION := $(shell git describe --match=v* --dirty --abbrev=0 | sed -e 's/^v//')
+DOCKER_TAG = ${DOCKER_TAG_VERSION}-armv6
 
 .PHONY: docker-build podman-build docker-push