build: Don't create user account with specific uid/gid

Using a specific uid/gid for the user account causes problems if the ids
clash with anything in the distro image.

Author: mpe

build/allcross/Dockerfile

@@ -52,11 +52,7 @@ RUN apt-get -q -y update && \
       xz-utils && \
     rm -rf /var/lib/apt/lists/* /tmp/packages.sh /var/cache/* /var/log/dpkg.log
 
-ARG uid
-ARG gid
-
-RUN groupadd --gid $gid linuxppc
-RUN useradd --uid $uid --gid $gid linuxppc
+RUN useradd linuxppc
 USER linuxppc
 
 COPY scripts/container-build.sh /bin/container-build.sh

build/docs/Dockerfile

@@ -29,11 +29,7 @@ RUN apt-get -q -y update && \
       && \
     rm -rf /var/lib/apt/lists/* /var/cache/* /var/log/dpkg.log
 
-ARG uid
-ARG gid
-
-RUN groupadd --gid $gid linuxppc
-RUN useradd --uid $uid --gid $gid linuxppc
+RUN useradd linuxppc
 USER linuxppc
 
 COPY scripts/container-build.sh /bin/container-build.sh

build/fedora/Dockerfile

@@ -41,11 +41,7 @@ RUN dnf -y install --setopt=install_weak_deps=False \
 COPY fedora/make-links.sh /tmp/make-links.sh
 RUN /tmp/make-links.sh ${compiler_version} && rm /tmp/make-links.sh
 
-ARG uid
-ARG gid
-
-RUN groupadd --gid $gid linuxppc
-RUN useradd --uid $uid --gid $gid linuxppc
+RUN useradd linuxppc
 USER linuxppc
 
 COPY scripts/container-build.sh /bin/container-build.sh

build/korg/Dockerfile

@@ -51,12 +51,7 @@ RUN curl -sSL $base_url/$tar_file > $tar_file && \
 COPY korg/make-links.sh /tmp/make-links.sh
 RUN /tmp/make-links.sh ${compiler_version} && rm /tmp/make-links.sh
 
-ARG uid
-ARG gid
-
-RUN userdel -r ubuntu || true
-RUN groupadd --gid $gid linuxppc
-RUN useradd --uid $uid --gid $gid linuxppc
+RUN useradd linuxppc
 USER linuxppc
 
 COPY scripts/container-build.sh /bin/container-build.sh

build/scripts/image.sh

@@ -117,23 +117,13 @@ if [[ -n "$https_proxy" ]]; then
     cmd+="--build-arg https_proxy=$https_proxy "
 fi
 
-if [[ -z "$UID" ]]; then
-    UID=$(id -u)
-fi
-
-if [[ -z "$GID" ]]; then
-    GID=$(id -g)
-fi
-
 if [[ "$distro" == "korg" ]]; then
     cmd+="--build-arg compiler_version=$version "
     arch=$(uname -m)
     cmd+="--build-arg base_url=https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/${arch}/${version}/ "
     cmd+="--build-arg tar_file=${arch}-gcc-${version}-nolibc-powerpc64-linux.tar.xz "
 fi
 
-cmd+="--build-arg uid=$UID "
-cmd+="--build-arg gid=$GID "
 cmd+="--build-arg from=$from "
 cmd+="--build-arg apt_mirror=$APT_MIRROR "
 cmd+="-t $image ."

build/ubuntu/Dockerfile

@@ -52,11 +52,7 @@ RUN apt-get -q -y update && \
 COPY ubuntu/make-links.sh /tmp/make-links.sh
 RUN /tmp/make-links.sh ${compiler_version} && rm /tmp/make-links.sh
 
-ARG uid
-ARG gid
-
-RUN groupadd --gid $gid linuxppc
-RUN useradd --uid $uid --gid $gid linuxppc
+RUN useradd linuxppc
 USER linuxppc
 
 COPY scripts/container-build.sh /bin/container-build.sh