AArch64 (arm64) support for image building, mock

[ta/build-tools.git] / docker-context / Dockerfile-dib

diff --git a/docker-context/Dockerfile-dib b/docker-context/Dockerfile-dib
index 1a339f0..33b0e2b 100644 (file)
--- a/docker-context/Dockerfile-dib
+++ b/docker-context/Dockerfile-dib
@@ -14,12 +14,19 @@
 
 
 # Use newer than the CentOS stock diskimage-builder via "cloud" repo
-FROM centos:7.5.1804
+FROM centos:7.6.1810
 RUN \
-    yum-config-manager --add-repo http://mirror.centos.org/centos/7/cloud/x86_64/openstack-queens/ && \
-    yum install --nogpgcheck -y diskimage-builder \
+    if [ "$(uname -m)" = aarch64 ]; then \
+        REPO_URI=http://mirror.centos.org/altarch/7/cloud/aarch64/openstack-queens/; \
+        EXTRA_RPM="gdisk dosfstools util-linux"; \
+    else \
+        REPO_URI=http://mirror.centos.org/centos/7/cloud/x86_64/openstack-queens/; \
+    fi && \
+    yum-config-manager --add-repo $REPO_URI && \
+    yum install --nogpgcheck -y \
         git \
         python \
+        python-pip \
         wget \
         which \
         findutils \
@@ -28,7 +35,11 @@ RUN \
         parted \
         sudo \
         e2fsprogs \
-        xfsprogs
+        xfsprogs \
+        qemu-img \
+        ${EXTRA_RPM:-} && \
+    pip install diskimage-builder==2.26.1 && \
+    yum remove -y python-pip
 RUN find -name 99-selinux-fixfiles-restore -exec rm {} \;
 
 WORKDIR /work