Browse Source

armv6 build

Fabian Peter Hammerle 3 years ago
parent
commit
ee4bf1c525
2 changed files with 2 additions and 7 deletions
  1. 1 1
      Dockerfile
  2. 1 6
      Makefile

+ 1 - 1
Dockerfile

@@ -13,7 +13,7 @@ USER 0
 RUN chown -R 0:0 . \
     && chmod a+rX -R -c .
 
-FROM docker.io/alpine:3.11
+FROM docker.io/arm32v6/alpine:3.11
 RUN apk add --no-cache \
         bash \
         bluez-btmon \

+ 1 - 6
Makefile

@@ -4,12 +4,7 @@ DOCKER_IMAGE_NAME := docker.io/fphammerle/andrewjfreyer-mqtt-bluetooth-presence-
 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_ARCH_SUFFIX = armv6
 DOCKER_TAG = ${DOCKER_TAG_VERSION}-monitor${MONITOR_VERSION}-${DOCKER_TAG_ARCH_SUFFIX}
 
 .PHONY: docker-build podman-build docker-push