Fix build issues with gcc (#685)

* Fix build issues with gcc

* fix qemu
This commit is contained in:
Pascal Vizeli 2020-05-26 08:02:53 +02:00 committed by GitHub
parent 70c41b5690
commit 7fc9c7d03b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions

View File

@ -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

View File

@ -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/*