Merge pull request #95 from galal-hussein/fix_s390x

Add fixes for the Dockerfile.chroot for s390x

Makefile

@@ -238,6 +238,7 @@ release: ensure-buildx clean
 		--build-arg BASE_IMAGE="$(BASE_IMAGE)" \
 		--build-arg VERSION="$(TAG)" \
 		--build-arg COMMIT_SHA="$(COMMIT_SHA)" \
+		--build-arg TARGETARCH="$(ARCH)" \
 		--build-arg BUILD_ID="$(BUILD_ID)" \
 		-t $(REGISTRY)/nginx-ingress-controller:$(TAG)-$(PLATFORMS) rootfs
 
@@ -249,5 +250,6 @@ release: ensure-buildx clean
 			--build-arg BASE_IMAGE="$(BASE_IMAGE)" \
 			--build-arg VERSION="$(TAG)" \
 			--build-arg COMMIT_SHA="$(COMMIT_SHA)" \
+			--build-arg TARGETARCH="$(ARCH)" \
 			--build-arg BUILD_ID="$(BUILD_ID)" \
 			-t $(REGISTRY)/nginx-ingress-controller-chroot:$(TAG)-$(PLATFORMS) rootfs -f rootfs/Dockerfile.chroot

rootfs/Dockerfile.chroot

@@ -41,14 +41,19 @@ ENV LUA_PATH="/usr/local/share/luajit-2.1.0-beta3/?.lua;/usr/local/share/lua/5.1
 ENV LUA_CPATH="/usr/local/lib/lua/?/?.so;/usr/local/lib/lua/?.so;;"
 ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin
 
-RUN microdnf install -y \
+RUN if [ "$TARGETARCH" = "s390x" ] ; then dnf install -y \
      bash \
      curl \
      openssl \
      ca-certificates \
      tzdata \
      diffutils \
-     util-linux 
+     util-linux ; else microdnf install bash \
+     curl \
+     openssl \
+     ca-certificates \
+     tzdata \
+     diffutils; fi
 
 COPY --chown=www-data:www-data etc /chroot/etc