Copy all qemu files because drone is being weird
continuous-integration/drone/push Build is passing Details

Change qemu version
This commit is contained in:
IamTheFij 2020-01-30 11:09:56 -08:00
parent 176feef895
commit 2b41676824
3 changed files with 7 additions and 6 deletions

View File

@ -1,3 +1,4 @@
---
kind: pipeline kind: pipeline
name: linux-amd64 name: linux-amd64
@ -38,7 +39,7 @@ steps:
from_secret: docker_password from_secret: docker_password
build_args: build_args:
- ARCH=arm - ARCH=arm
- REPO=arm32v6 - REPO=arm32v7
when: when:
branch: branch:
- master - master
@ -98,4 +99,3 @@ steps:
event: event:
- push - push
- tag - tag

View File

@ -1,14 +1,15 @@
ARG REPO=library ARG REPO=library
FROM multiarch/qemu-user-static:4.1.0-1 as qemu-user-static FROM multiarch/qemu-user-static:4.2.0-2 as qemu-user-static
# Make sure a dummy x86_64 file exists so that the copy command doesn't error # Make sure a dummy x86_64 file exists so that the copy command doesn't error
RUN touch /usr/bin/qemu-x86_64-fake # RUN touch /usr/bin/qemu-x86_64-fake
FROM ${REPO}/python:3-alpine FROM ${REPO}/python:3-alpine
# Copy mutliarch file to run builds on x86_64 # Copy mutliarch file to run builds on x86_64
ARG ARCH=x86_64 ARG ARCH=x86_64
COPY --from=qemu-user-static /usr/bin/qemu-${ARCH}-* /usr/bin/ COPY --from=qemu-user-static /usr/bin/qemu-* /usr/bin/
# COPY --from=qemu-user-static /usr/bin/qemu-${ARCH}-* /usr/bin/
RUN mkdir -p /src RUN mkdir -p /src
WORKDIR /src WORKDIR /src

View File

@ -14,7 +14,7 @@ build:
.PHONY: cross-build-arm .PHONY: cross-build-arm
cross-build-arm: cross-build-arm:
docker build --build-arg REPO=arm32v6 --build-arg ARCH=arm . -t ${DOCKER_TAG}-linux-arm docker build --build-arg REPO=arm32v7 --build-arg ARCH=arm . -t ${DOCKER_TAG}-linux-arm
.PHONY: cross-build-arm64 .PHONY: cross-build-arm64
cross-build-arm64: cross-build-arm64: