Merge pull request #2934 from alicefr/support_s390_alpine

Add s390x support for linuxkit docker images

tools/alpine/Makefile

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

tools/alpine/packages

@@ -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

tools/alpine/packages.aarch64

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

tools/alpine/packages.s390x

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

tools/alpine/packages.x86_64

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

tools/alpine/push-manifest.sh

@@ -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