Ver código fonte

build v0.5.0 armv6 image with podman

Fabian Peter Hammerle 3 anos atrás
pai
commit
1876799008
2 arquivos alterados com 6 adições e 11 exclusões
  1. 1 1
      Dockerfile
  2. 5 10
      Makefile

+ 1 - 1
Dockerfile

@@ -2,7 +2,7 @@
 
 # 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=/systemctl-mqtt
 
 

+ 5 - 10
Makefile

@@ -1,18 +1,13 @@
 # sync with https://github.com/fphammerle/switchbot-mqtt/blob/master/Makefile
 
-DOCKER_IMAGE_NAME := fphammerle/systemctl-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_IMAGE_NAME := docker.io/fphammerle/systemctl-mqtt
+DOCKER_TAG_VERSION := $(shell git describe --match=v* --abbrev=0 --dirty | sed -e 's/^v//')
+DOCKER_TAG = ${DOCKER_TAG_VERSION}-armv6
 
 .PHONY: docker-build docker-push
 
-docker-build:
-	sudo docker build -t "${DOCKER_IMAGE_NAME}:${DOCKER_TAG}" .
+podman-build:
+	podman build --format docker -t "${DOCKER_IMAGE_NAME}:${DOCKER_TAG}" .
 
 docker-push: docker-build
 	sudo docker push "${DOCKER_IMAGE_NAME}:${DOCKER_TAG}"