From a2363ff029f3e28aa863d4454dde6c6a38a44f66 Mon Sep 17 00:00:00 2001 From: Derek Brown Date: Fri, 14 Apr 2023 14:51:51 -0700 Subject: [PATCH] fix: name docker users --- .../docker/src/main/dockerfiles/spark/Dockerfile | 1 + .../src/main/dockerfiles/spark/bindings/R/Dockerfile | 8 +++++--- .../main/dockerfiles/spark/bindings/python/Dockerfile | 9 ++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile index 53026016ee26a..e98ba21c141e8 100644 --- a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile +++ b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile @@ -38,6 +38,7 @@ RUN set -ex && \ rm /bin/sh && \ ln -sv /bin/bash /bin/sh && \ echo "auth required pam_wheel.so use_uid" >> /etc/pam.d/su && \ + useradd -u ${spark_uid} spark && \ chgrp root /etc/passwd && chmod ug+rw /etc/passwd && \ rm -rf /var/cache/apt/* && rm -rf /var/lib/apt/lists/* diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/R/Dockerfile b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/R/Dockerfile index 3a5b96dc12be5..73537085a9077 100644 --- a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/R/Dockerfile +++ b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/R/Dockerfile @@ -17,6 +17,9 @@ ARG base_img +# Specify the User that the actual main process will run as +ARG spark_uid=185 + FROM $base_img WORKDIR / @@ -29,7 +32,8 @@ RUN mkdir ${SPARK_HOME}/R RUN \ apt-get update && \ apt install -y r-base r-base-dev && \ - rm -rf /var/cache/apt/* && rm -rf /var/lib/apt/lists/* + rm -rf /var/cache/apt/* && rm -rf /var/lib/apt/lists/* && \ + useradd -u ${spark_uid} spark COPY R ${SPARK_HOME}/R ENV R_HOME /usr/lib/R @@ -37,6 +41,4 @@ ENV R_HOME /usr/lib/R WORKDIR /opt/spark/work-dir ENTRYPOINT [ "/opt/entrypoint.sh" ] -# Specify the User that the actual main process will run as -ARG spark_uid=185 USER ${spark_uid} diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/python/Dockerfile b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/python/Dockerfile index 740aa7f0c43dc..6c76cb5b71008 100644 --- a/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/python/Dockerfile +++ b/resource-managers/kubernetes/docker/src/main/dockerfiles/spark/bindings/python/Dockerfile @@ -17,6 +17,9 @@ ARG base_img +# Specify the User that the actual main process will run as +ARG spark_uid=185 + FROM $base_img WORKDIR / @@ -28,7 +31,9 @@ RUN apt-get update && \ apt install -y python3 python3-pip && \ pip3 install --upgrade pip setuptools && \ # Removed the .cache to save space - rm -rf /root/.cache && rm -rf /var/cache/apt/* && rm -rf /var/lib/apt/lists/* + rm -rf /root/.cache && rm -rf /var/cache/apt/* && rm -rf /var/lib/apt/lists/* && \ + # Add the spark user + useradd -u ${spark_uid} spark COPY python/pyspark ${SPARK_HOME}/python/pyspark COPY python/lib ${SPARK_HOME}/python/lib @@ -36,6 +41,4 @@ COPY python/lib ${SPARK_HOME}/python/lib WORKDIR /opt/spark/work-dir ENTRYPOINT [ "/opt/entrypoint.sh" ] -# Specify the User that the actual main process will run as -ARG spark_uid=185 USER ${spark_uid}