vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

T1927: arm: Readd CI build of emulated ARM64 container

Browse Source 
After a successfull CI build of this container it is considered working and
is possible to add back to the build as a standard target.

The container is changed so it handles an architecture change without changing the dockerfile
This commit is contained in:
Runar Borge 2020-07-09 23:09:21 +02:00
parent c7b0a8897c
commit 60d36ca64f
2 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Jenkinsfile vendored
View File

@ -49,11 +49,7 @@ node('Docker') {
script { script {
dir('docker') { dir('docker') {
sh """ sh """
mkdir -p x86-64 docker build -t ${env.DOCKER_IMAGE} .
cp Dockerfile x86-64/Dockerfile
cp entrypoint.sh x86-64/entrypoint.sh
docker build -t ${env.DOCKER_IMAGE} x86-64
""" """
if ( ! isCustomBuild()) { if ( ! isCustomBuild()) {
withDockerRegistry([credentialsId: "DockerHub"]) { withDockerRegistry([credentialsId: "DockerHub"]) {
@ -81,26 +77,23 @@ node('Docker') {
// } // }
// } // }
// }, // },
// 'arm64': { 'arm64': {
// script { script {
// dir('docker') { dir('docker') {
// sh """ sh """
// cp Dockerfile arm64/Dockerfile docker build -t ${env.DOCKER_IMAGE_ARM64} --build-arg ARCH=arm64v8/ .
// cp entrypoint.sh arm64/entrypoint.sh
// sed -i 's#^FROM.*#FROM multiarch/debian-debootstrap:arm64-buster-slim#' arm64/Dockerfile """
// docker build -t ${env.DOCKER_IMAGE_ARM64} arm64
// if ( ! isCustomBuild()) {
// """ withDockerRegistry([credentialsId: "DockerHub"]) {
// sh "docker push ${env.DOCKER_IMAGE_ARM64}"
// if ( ! isCustomBuild()) {
// withDockerRegistry([credentialsId: "DockerHub"]) { }
// sh "docker push ${env.DOCKER_IMAGE_ARM64}" }
// }
// } }
// } }
// }
// }
// }
) )
} }
} }

26
docker/Dockerfile
View File

@ -17,22 +17,26 @@
# volume mapped in order to easy export images # volume mapped in order to easy export images
# This Dockerfile is installable on both x86, x86-64, armhf and arm64 systems # This Dockerfile is installable on both x86, x86-64, armhf and arm64 systems
# To install using native cpu instructionset use the default docker `FROM` statement ARG ARCH=
# (Use this to build on an x86/x86-64 pc/server and on an ARM system, eg. RaspberryPi) FROM ${ARCH}debian:buster
FROM debian:buster
# It is also possible to emulate an arm system inside docker, # It is also possible to emulate an arm system inside docker,
# execution of this emulated system needs to be executed on an x86 or x86-64 host. # execution of this emulated system needs to be executed on an x86 or x86-64 host.
# To install an qemu emulated armhf or arm64 cpu comment out the default `FROM` statement # To install using a non-native cpu instructionset use the `--build-arg ARCH=<ARCH>/`
# and use one of the following instead. # Supported architectures:
# ARMHF: # arm32v6/
#FROM multiarch/debian-debootstrap:armhf-buster-slim # arm32v7/
# ARM64: # arm64v8/
#FROM multiarch/debian-debootstrap:arm64-buster-slim # Example bo byukd natively:
# docker build -t vyos-build:current .
# Example to build on armhf:
# docker build -t vyos-build:current-armhf --build-arg ARCH=arm32v7/ .
# Example to build on arm64:
# docker build -t vyos-build:current-arm64 --build-arg ARCH=arm64v8/ .
# Prior of installing an emulated qemu build you need to install qemu, qemu-user-static # On some versions of docker the emulation framework is not installed by default and
# and register qemu inside docker using: # you need to install qemu, qemu-user-static and register qemu inside docker manually using:
# `docker run --rm --privileged multiarch/qemu-user-static:register --reset` # `docker run --rm --privileged multiarch/qemu-user-static:register --reset`