Copy all qemu files because drone is being weird
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
Change qemu version
This commit is contained in:
parent
176feef895
commit
2b41676824
@ -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
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
2
Makefile
2
Makefile
@ -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:
|
||||||
|
Loading…
Reference in New Issue
Block a user