Skip to content

Commit fc32509

Browse files
btashtonxiaoxiang781216
authored andcommitted
Switch to Ubuntu LTS 20.04 relaese for base image
1 parent 0a6adc9 commit fc32509

File tree

1 file changed

+34
-8
lines changed

1 file changed

+34
-8
lines changed

docker/linux/Dockerfile

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# License for the specific language governing permissions and limitations
1414
# under the License.
1515

16-
FROM ubuntu:19.10 AS builder-base
16+
FROM ubuntu:20.04 AS builder-base
1717
# NOTE WE ARE NOT REMOVEING APT CACHE.
1818
# This should only be used for temp build images that artifacts will be copied from
1919
RUN apt-get update -qq && apt-get install -y -qq \
@@ -25,7 +25,7 @@ RUN apt-get update -qq && apt-get install -y -qq \
2525
###############################################################################
2626
FROM builder-base AS nuttx-tools
2727

28-
RUN apt-get update -qq && apt-get install -y -qq \
28+
RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq \
2929
flex \
3030
bison \
3131
gperf \
@@ -105,10 +105,25 @@ RUN mkdir xtensa-esp32-elf-gcc && \
105105
curl -s -L "https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp32-2019r1-rc2-linux-amd64.tar.xz" \
106106
| tar -C xtensa-esp32-elf-gcc --strip-components 1 -xJ
107107

108-
RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends \
109-
git bison gperf python python-pip python-setuptools make cmake ninja-build ccache libffi-dev libssl-dev libusb-1.0
108+
RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq --no-install-recommends \
109+
git \
110+
bison \
111+
gperf \
112+
python3 \
113+
python-is-python3 \
114+
python3-pip \
115+
python3-setuptools \
116+
make \
117+
cmake \
118+
ninja-build \
119+
ccache \
120+
libffi-dev \
121+
libssl-dev \
122+
libusb-1.0
123+
110124
RUN git clone --depth 1 --shallow-submodules --recursive https://github.com/espressif/esp-idf.git
111125
# This is unfortunatly going to re-download some of the same toolchains, but will only be used in the context of esp-idf
126+
RUN sed -i "s/^gdbgui.*/gdbgui==0.13.2.0/" esp-idf/requirements.txt
112127
RUN bash -c "\
113128
cd esp-idf && \
114129
./install.sh"
@@ -133,8 +148,17 @@ RUN cp /tools/esp-idf/examples/get-started/hello_world/build/partition_table/par
133148
# Build image for tool required by Renesas builds
134149
###############################################################################
135150
FROM nuttx-toolchain-base AS nuttx-toolchain-renesas
136-
# Build Renesas RX GCC toolchain
137-
RUN apt-get install -y -qq build-essential flex bison texinfo libncurses5-dev m4 make g++ wget
151+
# Build Renesas RX GCC toolchain
152+
RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq \
153+
flex \
154+
bison \
155+
texinfo \
156+
libncurses5-dev \
157+
m4 \
158+
make \
159+
gcc \
160+
g++ \
161+
wget
138162

139163
# Download toolchain source code
140164
RUN mkdir -p /tools/renesas-tools/source/binutils && \
@@ -159,6 +183,7 @@ ENV PATH="/tools/renesas-toolchain/rx-elf-gcc/bin:$PATH"
159183
RUN cd renesas-tools/source/gcc && \
160184
chmod +x ./contrib/download_prerequisites ./configure ./move-if-change ./libgcc/mkheader.sh && \
161185
./contrib/download_prerequisites && \
186+
sed -i '1s/^/@documentencoding ISO-8859-1\n/' ./gcc/doc/gcc.texi && \
162187
sed -i 's/@tex/\n&/g' ./gcc/doc/gcc.texi && sed -i 's/@end tex/\n&/g' ./gcc/doc/gcc.texi && \
163188
mkdir -p /tools/renesas-tools/build/gcc && cd /tools/renesas-tools/build/gcc && \
164189
/tools/renesas-tools/source/gcc/configure --target=rx-elf --prefix=/tools/renesas-toolchain/rx-elf-gcc \
@@ -181,12 +206,12 @@ RUN cd /tools/renesas-tools/build/gcc && \
181206
# Final Docker image used for running CI system. This includes all toolchains
182207
# supported by the CI system.
183208
###############################################################################
184-
FROM ubuntu:19.10
209+
FROM ubuntu:20.04
185210
LABEL maintainer="[email protected]"
186211

187212
RUN dpkg --add-architecture i386
188213
# This is used for the final images so make sure to not store apt cache
189-
RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends \
214+
RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -qq --no-install-recommends \
190215
git \
191216
build-essential \
192217
gcc \
@@ -208,6 +233,7 @@ RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends \
208233
xxd \
209234
unzip \
210235
python3 \
236+
python-is-python3 \
211237
python3-pip \
212238
ccache \
213239
&& rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)