Skip to content

Commit b1b820e

Browse files
authored
[infra] Remove packages for format check and gbs build in docker (#15336)
This commit removes packages for format check and gbs build from the docker image. ONE-DCO-1.0-Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
1 parent a918fe2 commit b1b820e

File tree

3 files changed

+6
-41
lines changed

3 files changed

+6
-41
lines changed

infra/docker/focal/Dockerfile

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@
1414

1515
FROM ubuntu:20.04
1616

17-
# Install 'add-apt-repository'
18-
RUN apt-get update && apt-get -qqy install software-properties-common
19-
2017
# Install tzdata without user input
21-
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -qqy install tzdata
18+
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -qqy install tzdata
2219

2320
# Build tool
2421
RUN apt-get update && apt-get -qqy install build-essential cmake scons git lcov g++-arm-linux-gnueabihf g++-aarch64-linux-gnu
@@ -37,13 +34,7 @@ RUN apt-get update && \
3734
DEBIAN_FRONTEND=noninteractive \
3835
apt-get -qqy install doxygen graphviz wget zip unzip python3 python3-pip python3-venv python3-dev hdf5-tools curl
3936
RUN python3 -m pip install --upgrade pip
40-
RUN python3 -m pip install yapf==0.40.2 pylint numpy flatbuffers
41-
42-
# Install clang-format
43-
RUN apt-get install -qqy gnupg2
44-
RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
45-
RUN add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main"
46-
RUN apt-get update && apt-get install -qqy clang-format-16
37+
RUN python3 -m pip install numpy flatbuffers
4738

4839
# Install libtsan_preinit.o manually (workaround for missing package in focal)
4940
WORKDIR /root/tmp
@@ -54,10 +45,6 @@ RUN find usr -name "libtsan_preinit.o" | sed -e "s/10/9/g" | xargs -i cp libtsan
5445
WORKDIR /root
5546
RUN rm -rf /root/tmp
5647

57-
# Install gbs
58-
RUN echo 'deb [trusted=yes] http://download.tizen.org/tools/latest-release/Ubuntu_20.04/ /' | cat >> /etc/apt/sources.list
59-
RUN apt-get update && apt-get -qqy install gbs
60-
6148
# Setup user to match host user, and give superuser permissions
6249
ARG USER_ID=1000
6350
ARG GROUP_ID=${USER_ID}

infra/docker/jammy/Dockerfile

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@
1414

1515
FROM ubuntu:jammy
1616

17-
# Install 'add-apt-repository'
18-
RUN apt-get update && apt-get -qqy install software-properties-common
19-
2017
# Install tzdata without user input
21-
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -qqy install tzdata
18+
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -qqy install tzdata
2219

2320
# Build tool
2421
RUN apt-get update && apt-get -qqy install build-essential cmake scons git lcov g++-arm-linux-gnueabihf g++-aarch64-linux-gnu
@@ -37,17 +34,7 @@ RUN apt-get update && \
3734
DEBIAN_FRONTEND=noninteractive \
3835
apt-get -qqy install doxygen graphviz wget zip unzip python3 python3-pip python3-venv python3-dev hdf5-tools curl
3936
RUN python3 -m pip install --upgrade pip
40-
RUN python3 -m pip install yapf==0.40.2 pylint numpy flatbuffers
41-
42-
# Install clang-format
43-
RUN apt-get install -qqy gnupg2
44-
RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
45-
RUN add-apt-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main"
46-
RUN apt-get update && apt-get install -qqy clang-format-16
47-
48-
# Install gbs
49-
RUN echo 'deb [trusted=yes] http://download.tizen.org/tools/latest-release/Ubuntu_22.04/ /' | cat >> /etc/apt/sources.list
50-
RUN apt-get update && apt-get -qqy install gbs
37+
RUN python3 -m pip install numpy flatbuffers
5138

5239
# Setup user to match host user, and give superuser permissions
5340
ARG USER_ID=1000

infra/docker/noble/Dockerfile

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@
1414

1515
FROM ubuntu:noble
1616

17-
# Install 'add-apt-repository'
18-
RUN apt-get update && apt-get -qqy install software-properties-common
19-
2017
# Install tzdata without user input
21-
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -qqy install tzdata
18+
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -qqy install tzdata
2219

2320
# Build tool
2421
RUN apt-get update && apt-get -qqy install build-essential cmake scons git lcov g++-arm-linux-gnueabihf g++-aarch64-linux-gnu
@@ -32,13 +29,7 @@ RUN apt-get update && apt-get -qqy install libboost-all-dev libgflags-dev libgoo
3229
# Additonal tools
3330
RUN apt-get update && \
3431
apt-get -qqy install doxygen graphviz wget zip unzip python3 python3-pip python3-venv python3-dev hdf5-tools curl
35-
RUN python3 -m pip install yapf==0.40.2 pylint numpy flatbuffers --break-system-packages
36-
37-
# Install clang-format
38-
RUN apt-get update && apt-get -qqy install clang-format-16
39-
40-
# TODO: Install gbs & sdb
41-
# gbs & sdb are not support ubuntu noble yet
32+
RUN python3 -m pip install numpy flatbuffers --break-system-packages
4233

4334
# Setup user ubuntu: give superuser permissions without password
4435
RUN apt-get update && apt-get -qqy install sudo

0 commit comments

Comments
 (0)