Merge branch 'google:master' into master

shitamo · May 15, 2024 · 8815241 · 8815241
2 parents 3beb2db + dd0e505
commit 8815241
Show file tree

Hide file tree

Showing 102 changed files with 361 additions and 443 deletions.
diff --git a/docker/ubuntu22.04/Dockerfile b/docker/ubuntu22.04/Dockerfile
@@ -32,28 +32,28 @@
 
 FROM ubuntu:22.04
 
-ENV DEBIAN_FRONTEND noninteractive
+ARG DEBIAN_FRONTEND=noninteractive
 
 # Package installation
-RUN apt-get update --fix-missing
-RUN apt-get upgrade -y
-## Common packages for linux build environment
-RUN apt-get install -y python3 pkg-config git curl bzip2 unzip make ninja-build
-## Packages for linux desktop version
-RUN apt-get install -y libibus-1.0-dev libglib2.0-dev qt6-base-dev libgl-dev
-## Packages for misc tools
-RUN apt-get install -y nano
-## Setting up Android SDK requires OpenJDK.
-RUN apt-get install -y openjdk-17-jdk
+## https://docs.docker.com/develop/develop-images/instructions/#apt-get
+RUN apt-get update && apt-get install -y \
+    ## Common packages for linux build environment
+    python3 pkg-config git curl bzip2 unzip make ninja-build \
+    ## Packages for linux desktop version
+    libibus-1.0-dev libglib2.0-dev qt6-base-dev libgl-dev \
+    ## Packages for misc tools
+    nano \
+    ## Setting up Android SDK requires OpenJDK.
+    openjdk-17-jdk \
+    ## For setting up bazel below
+    curl gnupg libncurses5 \
+  && rm -rf /var/lib/apt/lists/*
 
 ## For Bazel
-## https://docs.bazel.build/versions/master/install-ubuntu.html
-RUN apt-get install -y curl gnupg libncurses5
-RUN curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor > bazel.gpg
-RUN mv bazel.gpg /etc/apt/trusted.gpg.d/
-RUN echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list
-RUN apt-get update
-RUN apt-get install -y bazel
+## https://bazel.build/install/ubuntu#install-on-ubuntu
+RUN curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor > /usr/share/keyrings/bazel-archive-keyring.gpg
+RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list
+RUN apt-get update && apt-get install -y bazel && rm -rf /var/lib/apt/lists/*
 
 # Working environemnt
 ENV HOME /home/mozc_builder

diff --git a/docker/ubuntu24.04/Dockerfile b/docker/ubuntu24.04/Dockerfile
@@ -32,19 +32,18 @@
 
 FROM ubuntu:24.04
 
-ENV DEBIAN_FRONTEND noninteractive
-
 # Package installation
-RUN apt-get update --fix-missing
-RUN apt-get upgrade -y
-## Common packages for linux build environment
-RUN apt-get install -y python3 pkg-config git curl unzip g++ gcc
-## Packages for linux desktop version
-RUN apt-get install -y libibus-1.0-dev libglib2.0-dev qt6-base-dev libgl-dev
-## Packages for misc tools
-RUN apt-get install -y nano
-## Setting up Android SDK requires OpenJDK.
-RUN apt-get install -y openjdk-17-jdk
+## https://docs.docker.com/develop/develop-images/instructions/#apt-get
+RUN apt-get update && apt-get install -y \
+    ## Common packages for linux build environment
+    python3 pkg-config git curl unzip g++ gcc \
+    ## Packages for linux desktop version
+    libibus-1.0-dev libglib2.0-dev qt6-base-dev libgl-dev \
+    ## Packages for misc tools
+    nano \
+    ## Setting up Android SDK requires OpenJDK.
+    openjdk-17-jdk \
+  && rm -rf /var/lib/apt/lists/*
 
 # Working environemnt
 ENV HOME /home/mozc_builder
@@ -56,9 +55,9 @@ RUN mkdir -p /home/mozc_builder/work
 WORKDIR /home/mozc_builder/work
 
 ## Set up Bazel
-RUN curl -LO https://github.com/bazelbuild/bazel/releases/download/7.1.1/bazel-7.1.1-installer-linux-x86_64.sh
-RUN bash bazel-7.1.1-installer-linux-x86_64.sh --user
-RUN rm bazel-7.1.1-installer-linux-x86_64.sh
+RUN curl -LO https://github.com/bazelbuild/bazel/releases/download/7.1.1/bazel-7.1.1-installer-linux-x86_64.sh \
+  && bash bazel-7.1.1-installer-linux-x86_64.sh --user \
+  && rm bazel-7.1.1-installer-linux-x86_64.sh
 
 ## Set up Android SDK and NDK
 ENV ANDROID_HOME /home/mozc_builder/Android/Sdk