remove unnecessary build args

Takashi Matsuo · Takashi Matsuo · commit 6fdea00160a0 · 2020-05-28T22:43:48.000Z
diff --git a/.kokoro/docker/Dockerfile b/.kokoro/docker/Dockerfile
@@ -166,19 +166,12 @@ RUN sudo systemctl enable redis-server.service
 # kbuilder uid on the default Kokoro image
 ARG UID=1000
 ARG USERNAME=kbuilder
-ARG DOCKER_GID=999
 
 # Add a new user to the container image.
-# To allow access to the docker socket on the host, we use the docker
-# group on the host.
+# This is needed for ssh and sudo access.
 
-# First make sure the group exists. Ignore a failure in case
-# there is already a group with that id.
-RUN groupadd -g ${DOCKER_GID} "host-docker" | true
-
-# Add a new user with the caller's uid and the docker goup id on the
-# host.
-RUN useradd -d /h -u ${UID} -g ${DOCKER_GID} ${USERNAME}
+# Add a new user with the caller's uid and the username.
+RUN useradd -d /h -u ${UID} ${USERNAME}
 
 # Allow nopasswd sudo
 RUN echo "${USERNAME} ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
diff --git a/.kokoro/trampoline_v2.sh b/.kokoro/trampoline_v2.sh
@@ -240,9 +240,7 @@ if [[ "${TRAMPOLINE_DOCKERFILE:-none}" != "none" ]]; then
 	"-f" "${TRAMPOLINE_DOCKERFILE}"
 	"-t" "${TRAMPOLINE_IMAGE}"
 	"--build-arg" "UID=${user_uid}"
-	"--build-arg" "GID=${user_gid}"
 	"--build-arg" "USERNAME=${user_name}"
-	"--build-arg" "DOCKER_GID=${docker_gid}"
     )
     if [[ "${has_cache}" == "true" ]]; then
 	docker_build_flags+=("--cache-from" "${TRAMPOLINE_IMAGE}")
@@ -280,6 +278,8 @@ docker_flags=(
 
     # Run the docker script with the user id. Because the docker image gets to
     # write in ${PWD} you typically want this to be your user id.
+    # To allow docker in docker, we need to use docker gid on the host.
+    # Now we passing the wrong one in order to see the build report failure.
     "--user" "${user_uid}:${user_gid}"
 
     # Pass down the USER.
