From 7fc9c7d03b9beac0ef821a371e282b275dc00ffa Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Tue, 26 May 2020 08:02:53 +0200
Subject: [PATCH] Fix build issues with gcc (#685)

* Fix build issues with gcc

* fix qemu
---
 Dockerfile                                       | 16 +++++++---------
 .../package/hassio/builder/Dockerfile            |  8 +++++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2944c843c..73bb37ba0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM debian:buster
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -9,9 +9,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         ca-certificates \
         curl \
         gpg-agent \
+        gpg \
+        dirmngr \
         software-properties-common \
-    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
-    && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
+    && curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
+    && add-apt-repository "deb https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
     && apt-get update && apt-get install -y --no-install-recommends \
         docker-ce \
     && rm -rf /var/lib/apt/lists/*
@@ -21,25 +23,21 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         bash \
         bc \
         binutils \
-        bison \
+        build-essential \
         bzip2 \
         cpio \
         file \
-        flex \
-        g++ \
         git \
-        locales \
         make \
         ncurses-dev \
         patch \
         perl \
         python \
-        qemu-utils \
         rsync \
         sudo \
         unzip \
-        vim \
         wget \
+        qemu-utils \
     && rm -rf /var/lib/apt/lists/*
 
 # Init entry
diff --git a/buildroot-external/package/hassio/builder/Dockerfile b/buildroot-external/package/hassio/builder/Dockerfile
index 8a131f763..7a421327e 100644
--- a/buildroot-external/package/hassio/builder/Dockerfile
+++ b/buildroot-external/package/hassio/builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM debian:buster
 
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -10,9 +10,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         curl \
         jq \
         gpg-agent \
+        gpg \
+        dirmngr \
         software-properties-common \
-    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
-    && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
+    && curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
+    && add-apt-repository "deb https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
     && apt-get update && apt-get install -y --no-install-recommends \
         docker-ce docker-ce-cli containerd.io \
     && rm -rf /var/lib/apt/lists/*