another attempt at fixing qemu

Author: xquery

.github/workflows/build_ci_multi.yml

@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v3
       - run: |
           sudo apt-get update
-          sudo apt-get -y install buildah less git make podman qemu clamav clamav-freshclam
+          sudo apt-get -y install buildah less git make podman qemu qemu-user-static clamav clamav-freshclam
         name: 'install dev deps'
       - run: buildah unshare make branch_or_ref=master release_tag=master multibuild
         name: 'build multi image'

.github/workflows/build_latest_release_multi.yml

@@ -40,7 +40,7 @@ jobs:
           docker login -u ${{secrets.QUAY_USER}} -p ${{secrets.QUAY_TOKEN}} quay.io
       - run: |
           sudo apt-get update
-          sudo apt-get -y install buildah less git make podman qemu clamav clamav-freshclam
+          sudo apt-get -y install buildah less git make podman qemu qemu-user-static clamav clamav-freshclam
         name: 'install dev deps'
       - name: Sets env vars
         run: |

.github/workflows/build_master_multi.yml

@@ -43,7 +43,7 @@ jobs:
           docker login -u ${{secrets.QUAY_USER}} -p ${{secrets.QUAY_TOKEN}} quay.io
       - run: |
           sudo apt-get update
-          sudo apt-get -y install buildah less git make podman qemu clamav clamav-freshclam
+          sudo apt-get -y install buildah less git make podman qemu qemu-user-static clamav clamav-freshclam
         name: 'install dev deps'
       - run: buildah unshare make branch_or_ref=master release_tag=master multibuild
         name: 'build multi image'

Containerfile

@@ -11,7 +11,7 @@
 
 from quay.io/buildah/stable:latest
 
-RUN dnf --nodocs --setopt install_weak_deps=false -y install less git make podman qemu-user-static buildah clamav clamav-freshclam
+RUN dnf --nodocs --setopt install_weak_deps=false -y install less git make podman qemu qemu-user-static buildah clamav clamav-freshclam
 
 COPY requirements.txt requirements.txt
 RUN python3 -m ensurepip

Makefile

@@ -30,6 +30,17 @@ build_debian:
 build_fedora:
 	./create_dev_image.sh ${arch} ${fedora_base} ${compiler} "gcc cargo zsh git openssl-devel python3 python3-devel python3-pip libtool curl stunnel perl nghttp2 brotli" " --enable-ipv6 --enable-unix-sockets -with-ssl --with-libssh2 --with-nghttp2=/usr" ${branch_or_ref} curl-dev-fedora:${release_tag}
 
+##############################################
+# build_alpine dev, base and appliance image
+##############################################
+#
+#  > make branch_or_ref=master release_tag=master run_tests=1 build_arm64
+#
+build_arm64:
+	./create_dev_image.sh "linux/arm" ${base} ${compiler} ${dev_deps} ${build_opts} ${branch_or_ref} curl-dev-linux-arm64:${release_tag} ${run_tests}
+# 	./create_base_image.sh "linux/arm64" ${base} localhost/curl-dev-linux-arm64:${release_tag} ${base_deps} curl-base-linux-arm64:${release_tag} ${release_tag}
+# 	./create_appliance_image.sh "linux/arm64" localhost/curl-base-linux-arm64:${release_tag} curl-linux-arm64:${release_tag} ${release_tag}
+
 ##############################################
 # build_alpine dev, base and appliance image
 ##############################################

create_dev_image.sh

@@ -39,7 +39,7 @@ buildah config --label name="${image_name}" $bdr
 
 # determine dist package manager
 if [[ "$dist" =~ .*"alpine".* ]]; then
-  package_manage_update="apk update upgrade"
+  package_manage_update="apk upgrade"
   package_manage_add="apk add "
 fi
 if [[ "$dist" =~ .*"fedora".* ]]; then
@@ -51,13 +51,10 @@ if [[ "$dist" =~ .*"debian".* ]]; then
   package_manage_add="apt-get -y install "
 fi
 
-echo ${package_manage_update}
 
 # install deps using specific dist package manager
-echo $install_deps
 buildah run $bdr ${package_manage_update}
 buildah run $bdr ${package_manage_add} ${deps}
-echo "her."
 
 # setup curl source derived from branch or tag
 echo "get curl source"

create_multi.sh

@@ -24,8 +24,7 @@ buildah manifest create curl-base-multi:${release_tag}
 buildah manifest create curl-multi:${release_tag}
 
 # loop through supported arches
-#for IMGTAG in "linux/amd64"  "linux/arm64" "linux/arm/v7" "linux/ppc64le" "linux/s390x" "linux/386" ; do
-for IMGTAG in "linux/amd64" "linux/ppc64le" "linux/s390x" "linux/386" ; do
+for IMGTAG in "linux/amd64"  "linux/arm64" "linux/arm/v7" "linux/ppc64le" "linux/s390x" "linux/386" ; do
   pathname="${IMGTAG////-}"
   echo "building $IMGTAG : $pathname"
  	./create_dev_image.sh "$IMGTAG" ${base} ${compiler} "$dev_deps" "$build_opts" ${branch_or_ref} curl-dev-${pathname}:${release_tag} 0