Try to do multi-arch on docker hub

This commit is contained in:
ViViDboarder 2019-08-05 16:22:37 -07:00
parent fbd8117b3c
commit 56e900b9aa
4 changed files with 11 additions and 7 deletions

View File

@ -1,8 +1,6 @@
FROM resin/rpi-raspbian:jessie FROM raspbian/jessie
MAINTAINER ViViDboarder <vividboarder@gmail.com> MAINTAINER ViViDboarder <vividboarder@gmail.com>
RUN [ "cross-build-start" ]
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
cron \ cron \
@ -26,8 +24,6 @@ RUN apt-get update \
python-swiftclient \ python-swiftclient \
&& rm -rf /var/apt/lists/* && rm -rf /var/apt/lists/*
RUN [ "cross-build-end" ]
VOLUME /root/.cache/duplicity VOLUME /root/.cache/duplicity
VOLUME /backups VOLUME /backups
VOLUME /var/lock/duplicity VOLUME /var/lock/duplicity

View File

@ -8,11 +8,11 @@ test: test-x86
.PHONY: build-x86 .PHONY: build-x86
build-x86: build-x86:
docker build -f ./Dockerfile.ubuntu -t $(DOCKER_TAG):ubuntu . docker build -f ./Dockerfile -t $(DOCKER_TAG):ubuntu .
.PHONY: build-arm .PHONY: build-arm
build-arm: build-arm:
docker build -f ./Dockerfile.raspbian -t $(DOCKER_TAG):raspbian . docker build -f ./Dockerfile.armhf -t $(DOCKER_TAG):raspbian .
.PHONY: build-all .PHONY: build-all
build-all: build-x86 build-arm build-all: build-x86 build-arm

8
hooks/pre_build Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
BUILD_ARCH=$(echo "${DOCKERFILE_PATH}" | cut -d '.' -f 2)
[ "${BUILD_ARCH}" == "Dockerfile" ] && \
{ echo 'qemu-user-static: Registration not required for current arch'; exit 0; }
docker run --rm --privileged multiarch/qemu-user-static:register --reset