Merge pull request #11846 from ilya-zuyev/ilyaz/fix_kvm2_arm64_docker…

…file Fix kvm2-arm64 build error
kubernetes · Jun 30, 2021 · 050b70f · 050b70f
2 parents bc95a2f + 053b73b
commit 050b70f
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/installers/linux/kvm/Dockerfile.arm64 b/installers/linux/kvm/Dockerfile.arm64
@@ -12,23 +12,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:21.04
+FROM ubuntu:20.04
 
 ARG GO_VERSION
 
 RUN apt update
 
-RUN echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports hirsute main universe multiverse" >> /etc/apt/sources.list && \
-    echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports hirsute-updates main universe restricted multiverse" >> /etc/apt/sources.list && \
+RUN echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main universe multiverse" >> /etc/apt/sources.list && \
+    echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal-updates main universe restricted multiverse" >> /etc/apt/sources.list && \
     dpkg --add-architecture arm64 && \
     (apt update || true)
 
-RUN apt install -y \
+RUN DEBIAN_FRONTEND=noninteractive \
+    apt install \
+    -o APT::Immediate-Configure=false -y \
     gcc-aarch64-linux-gnu \
     make \
     pkg-config \
     curl \
-    libvirt-dev:arm64
+    libvirt-dev:arm64 && \
+    dpkg --configure -a
 
 RUN curl -sSL https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz | tar -C /usr/local -xzf -