mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-07-25 14:06:31 +00:00
Fix build issues with gcc (#685)
* Fix build issues with gcc * fix qemu
This commit is contained in:
parent
70c41b5690
commit
7fc9c7d03b
16
Dockerfile
16
Dockerfile
@ -1,4 +1,4 @@
|
|||||||
FROM ubuntu:18.04
|
FROM debian:buster
|
||||||
|
|
||||||
# Set shell
|
# Set shell
|
||||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||||
@ -9,9 +9,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
gpg-agent \
|
gpg-agent \
|
||||||
|
gpg \
|
||||||
|
dirmngr \
|
||||||
software-properties-common \
|
software-properties-common \
|
||||||
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
|
&& curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
|
||||||
&& add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
|
&& add-apt-repository "deb https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
|
||||||
&& apt-get update && apt-get install -y --no-install-recommends \
|
&& apt-get update && apt-get install -y --no-install-recommends \
|
||||||
docker-ce \
|
docker-ce \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
@ -21,25 +23,21 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||||||
bash \
|
bash \
|
||||||
bc \
|
bc \
|
||||||
binutils \
|
binutils \
|
||||||
bison \
|
build-essential \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
cpio \
|
cpio \
|
||||||
file \
|
file \
|
||||||
flex \
|
|
||||||
g++ \
|
|
||||||
git \
|
git \
|
||||||
locales \
|
|
||||||
make \
|
make \
|
||||||
ncurses-dev \
|
ncurses-dev \
|
||||||
patch \
|
patch \
|
||||||
perl \
|
perl \
|
||||||
python \
|
python \
|
||||||
qemu-utils \
|
|
||||||
rsync \
|
rsync \
|
||||||
sudo \
|
sudo \
|
||||||
unzip \
|
unzip \
|
||||||
vim \
|
|
||||||
wget \
|
wget \
|
||||||
|
qemu-utils \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Init entry
|
# Init entry
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM ubuntu:18.04
|
FROM debian:buster
|
||||||
|
|
||||||
# Set shell
|
# Set shell
|
||||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||||
@ -10,9 +10,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||||||
curl \
|
curl \
|
||||||
jq \
|
jq \
|
||||||
gpg-agent \
|
gpg-agent \
|
||||||
|
gpg \
|
||||||
|
dirmngr \
|
||||||
software-properties-common \
|
software-properties-common \
|
||||||
&& curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
|
&& curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
|
||||||
&& add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
|
&& add-apt-repository "deb https://download.docker.com/linux/debian $(lsb_release -cs) stable" \
|
||||||
&& apt-get update && apt-get install -y --no-install-recommends \
|
&& apt-get update && apt-get install -y --no-install-recommends \
|
||||||
docker-ce docker-ce-cli containerd.io \
|
docker-ce docker-ce-cli containerd.io \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user