Add s390x support for linuxkit docker images

Add support for s390 architecture for linuxkit/alpine and the
other docker images in tools and pkg.

Signed-off-by: Alice Frosi <alice@linux.vnet.ibm.com>
This commit is contained in:
Alice Frosi 2017-11-03 17:11:07 +01:00 committed by Alice Frosi
parent 0d8fab9ac9
commit 4591410607
6 changed files with 14 additions and 2 deletions

View File

@ -19,6 +19,10 @@ ifeq ($(ARCH), aarch64)
DEPS += packages.aarch64
SUFFIX=-arm64
endif
ifeq ($(ARCH), s390x)
DEPS += packages.s390x
SUFFIX=-s390x
endif
default: push

View File

@ -46,7 +46,6 @@ gmp-dev
gnupg
go
grep
gummiboot
hvtools
installkernel
iperf3
@ -65,7 +64,6 @@ libressl-dev
libseccomp-dev
libtirpc-dev
libtool
libunwind-dev
linux-headers
lsscsi
make

View File

@ -1 +1,3 @@
gummiboot
libunwind-dev
qemu-system-aarch64

View File

@ -0,0 +1 @@
qemu-system-s390x

View File

@ -1,3 +1,5 @@
gummiboot
libunwind-dev
open-vm-tools
ovmf
syslinux

View File

@ -19,6 +19,7 @@ IMAGE=$2
IMG_X86_64=$(head -1 versions.x86_64 | sed 's,[#| ]*,,')
IMG_ARM64=$(head -1 versions.aarch64 | sed 's,[#| ]*,,')
IMG_s390x=$(head -1 versions.s390x | sed 's,[#| ]*,,')
# Extract the TAG from the x86_64 name and build the manifest target name
TAG=$(echo "$IMG_X86_64" | sed 's,\-.*$,,' | cut -d':' -f2)
TARGET="$ORG/$IMAGE:$TAG"
@ -35,6 +36,10 @@ manifests:
platform:
architecture: amd64
os: linux
- image: $IMG_s390x
platform:
architecture: s390x
os: linux
EOF
# Work out credentials. On macOS they are needed for manifest-tool and