From 5ee01d8db2a4cfe52f8bf929b57cdbc4eb703558 Mon Sep 17 00:00:00 2001
From: hackercat <me@hackerc.at>
Date: Sun, 4 Apr 2021 18:45:45 +0000
Subject: [PATCH] refactor: add `USER`, move steps in Dockerfile

---
 linux/ubuntu/act/Dockerfile    |   2 +-
 linux/ubuntu/runner/Dockerfile | 198 ++++++++++++++++-----------------
 2 files changed, 100 insertions(+), 100 deletions(-)

diff --git a/linux/ubuntu/act/Dockerfile b/linux/ubuntu/act/Dockerfile
index 8f9fa10..70be3ab 100644
--- a/linux/ubuntu/act/Dockerfile
+++ b/linux/ubuntu/act/Dockerfile
@@ -41,7 +41,7 @@ RUN set -Eeuxo pipefail \
     && printf "Updated apt lists and upgraded packages\n\n" \
     && apt -yq install --no-install-recommends ssh lsb-release gawk jq curl git wget sudo gnupg-agent ca-certificates software-properties-common apt-transport-https libyaml-0-2 zstd unzip xz-utils $(apt-cache search libicu | grep -E 'libicu[[:digit:]]+ -' | cut -d " " -f 1) \
     && printf "Installed base utils\nInstalling docker\n" \
-    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - \
+    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
     && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
     && apt -yq update \
     && apt -yq install docker-ce-cli \
diff --git a/linux/ubuntu/runner/Dockerfile b/linux/ubuntu/runner/Dockerfile
index 9654ae9..812771e 100644
--- a/linux/ubuntu/runner/Dockerfile
+++ b/linux/ubuntu/runner/Dockerfile
@@ -1,99 +1,99 @@
-ARG DISTRIB_ID=ubuntu
-ARG DISTRIB_RELEASE=20.04
-FROM ${DISTRIB_ID}:${DISTRIB_RELEASE}
-
-# > ARGs before FROM are not accessible
-ARG DISTRIB_ID=ubuntu
-ARG DISTRIB_RELEASE=20.04
-
-# > non-root user
-ARG RUNNER_USER=runner
-
-# > Node version
-ARG NODE_VERSION=12
-
-# > Force apt to not be interactive/not ask
-ARG DEBIAN_FRONTEND=noninteractive
-
-SHELL [ "/bin/bash", "-c" ]
-
-# > setup environment required for GitHub Actions
-RUN set -Eeuxo pipefail \
-    && printf "Build started\n" \
-    && ImageOS=${DISTRIB_ID}$(echo ${DISTRIB_RELEASE} | cut -d'.' -f 1) \
-    && echo "IMAGE_OS=$ImageOS" | tee -a /etc/environment \
-    && echo "ImageOS=$ImageOS" | tee -a /etc/environment \
-    && echo "LSB_RELEASE=${DISTRIB_RELEASE}" | tee -a /etc/environment \
-    && AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache \
-    && echo "AGENT_TOOLSDIRECTORY=$AGENT_TOOLSDIRECTORY" | tee -a /etc/environment \
-    && echo "RUN_TOOL_CACHE=$AGENT_TOOLSDIRECTORY" | tee -a /etc/environment \
-    && echo "DEPLOYMENT_BASEPATH=/opt/runner" | tee -a /etc/environment \
-    && echo ". /etc/environment" | tee -a /etc/profile \
-    && mkdir -p $AGENT_TOOLSDIRECTORY \
-    && chown 1000:1000 $AGENT_TOOLSDIRECTORY \
-    && chmod 0777 $AGENT_TOOLSDIRECTORY \
-    && mkdir -p /github \
-    && chown 1000:1000 /github \
-    && chmod 0777 /github \
-    && echo "RUNNER_USER=${RUNNER_USER}" | tee -a /etc/environment \
-    && echo "RUNNER_TEMP=/home/${RUNNER_USER}/work/_temp" | tee -a /etc/environment
-
-# > Install deps
-RUN set -Eeuxo pipefail \
-    && apt -yq update \
-    && printf "Updated apt lists and upgraded packages\n\n" \
-    && apt -yq install --no-install-recommends ssh lsb-release gawk jq curl git wget sudo gnupg-agent ca-certificates software-properties-common apt-transport-https libyaml-0-2 zstd unzip xz-utils $(apt-cache search libicu | grep -E 'libicu[[:digit:]]+ -' | cut -d " " -f 1) \
-    && printf "Installed base utils\nInstalling docker\n" \
-    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - \
-    && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
-    && apt -yq update \
-    && apt -yq install docker-ce-cli \
-    && printf "Cleaning image\n" \
-    && apt-get clean \
-    && rm -rf /var/cache/* \
-    && rm -rf /var/log/* \
-    && rm -rf /var/lib/apt/lists/* \
-    && rm -rf /tmp/* \
-    && printf "Cleaned up image\n"
-
-# > Install Node.JS
-RUN set -Eeuxo pipefail \
-    && printf "Installing Node.JS\n" \
-    && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
-    && DISTRO="$(lsb_release -s -c)" \
-    && echo "deb https://deb.nodesource.com/node_${NODE_VERSION}.x $DISTRO main" | tee /etc/apt/sources.list.d/nodesource.list \
-    && echo "deb-src https://deb.nodesource.com/node_${NODE_VERSION}.x $DISTRO main" | tee -a /etc/apt/sources.list.d/nodesource.list \
-    && apt -yq update \
-    && apt -yq install --no-install-recommends nodejs="${NODE_VERSION}*" \
-    && printf "Installed Node.JS $(node -v)\n" \
-    && dpkg-query -f '${binary:Package}\n' -W \
-    && printf "Cleaning image\n" \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && rm -rf /tmp/* \
-    && printf "Cleaned up image\n"
-
-# > Create non-root user
-RUN set -Eeuxo pipefail && \
-    printf "Creating non-root user\n" && \
-    groupadd -g 1000 ${RUNNER_USER} && \
-    useradd -u 1000 -g ${RUNNER_USER} -G sudo -m -s /bin/bash ${RUNNER_USER} && \
-    sed -i /etc/sudoers -re 's/^%sudo.*/%sudo ALL=(ALL:ALL) NOPASSWD: ALL/g' && \
-    sed -i /etc/sudoers -re 's/^root.*/root ALL=(ALL:ALL) NOPASSWD: ALL/g' && \
-    sed -i /etc/sudoers -re 's/^#includedir.*/## **Removed the include directive** ##"/g' && \
-    echo "${RUNNER_USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
-    printf "runner user: $(su - ${RUNNER_USER} -c id)\n" && \
-    printf "Created non-root user $(grep ${RUNNER_USER} /etc/passwd)\n"
-
-# > Home repository
-LABEL org.opencontainers.image.source="https://github.com/catthehacker/docker_images"
-
-# > Don't run as root, generally not good idea
-USER ${RUNNER_USER}:${RUNNER_USER}
-
-WORKDIR /home/runner
-
-SHELL [ "/bin/bash", "--login", "-c" ]
-
-# > Force bash with environment
-ENTRYPOINT [ "/bin/bash", "--login", "-c" ]
+ARG DISTRIB_ID=ubuntu
+ARG DISTRIB_RELEASE=20.04
+FROM ${DISTRIB_ID}:${DISTRIB_RELEASE}
+
+# > ARGs before FROM are not accessible
+ARG DISTRIB_ID=ubuntu
+ARG DISTRIB_RELEASE=20.04
+
+# > non-root user
+ARG RUNNER_USER=runner
+
+# > Node version
+ARG NODE_VERSION=12
+
+# > Force apt to not be interactive/not ask
+ARG DEBIAN_FRONTEND=noninteractive
+
+SHELL [ "/bin/bash", "-c" ]
+
+# > setup environment required for GitHub Actions
+RUN set -Eeuxo pipefail \
+    && printf "Build started\n" \
+    && ImageOS=${DISTRIB_ID}$(echo ${DISTRIB_RELEASE} | cut -d'.' -f 1) \
+    && echo "IMAGE_OS=$ImageOS" | tee -a /etc/environment \
+    && echo "ImageOS=$ImageOS" | tee -a /etc/environment \
+    && echo "LSB_RELEASE=${DISTRIB_RELEASE}" | tee -a /etc/environment \
+    && AGENT_TOOLSDIRECTORY=/opt/hostedtoolcache \
+    && echo "AGENT_TOOLSDIRECTORY=$AGENT_TOOLSDIRECTORY" | tee -a /etc/environment \
+    && echo "RUN_TOOL_CACHE=$AGENT_TOOLSDIRECTORY" | tee -a /etc/environment \
+    && echo "DEPLOYMENT_BASEPATH=/opt/runner" | tee -a /etc/environment \
+    && echo ". /etc/environment" | tee -a /etc/profile \
+    && mkdir -p $AGENT_TOOLSDIRECTORY \
+    && chown 1000:1000 $AGENT_TOOLSDIRECTORY \
+    && chmod 0777 $AGENT_TOOLSDIRECTORY \
+    && mkdir -p /github \
+    && chown 1000:1000 /github \
+    && chmod 0777 /github \
+    && echo "RUNNER_USER=${RUNNER_USER}" | tee -a /etc/environment \
+    && echo "RUNNER_TEMP=/home/${RUNNER_USER}/work/_temp" | tee -a /etc/environment
+
+# > Install deps
+RUN set -Eeuxo pipefail \
+    && apt -yq update \
+    && printf "Updated apt lists and upgraded packages\n\n" \
+    && apt -yq install --no-install-recommends ssh lsb-release gawk jq curl git wget sudo gnupg-agent ca-certificates software-properties-common apt-transport-https libyaml-0-2 zstd unzip xz-utils $(apt-cache search libicu | grep -E 'libicu[[:digit:]]+ -' | cut -d " " -f 1) \
+    && printf "Installed base utils\nInstalling docker\n" \
+    && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
+    && add-apt-repository "deb https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
+    && apt -yq update \
+    && apt -yq install docker-ce-cli \
+    && printf "Cleaning image\n" \
+    && apt-get clean \
+    && rm -rf /var/cache/* \
+    && rm -rf /var/log/* \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /tmp/* \
+    && printf "Cleaned up image\n"
+
+# > Install Node.JS
+RUN set -Eeuxo pipefail \
+    && printf "Installing Node.JS\n" \
+    && curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
+    && DISTRO="$(lsb_release -s -c)" \
+    && echo "deb https://deb.nodesource.com/node_${NODE_VERSION}.x $DISTRO main" | tee /etc/apt/sources.list.d/nodesource.list \
+    && echo "deb-src https://deb.nodesource.com/node_${NODE_VERSION}.x $DISTRO main" | tee -a /etc/apt/sources.list.d/nodesource.list \
+    && apt -yq update \
+    && apt -yq install --no-install-recommends nodejs="${NODE_VERSION}*" \
+    && printf "Installed Node.JS $(node -v)\n" \
+    && dpkg-query -f '${binary:Package}\n' -W \
+    && printf "Cleaning image\n" \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /tmp/* \
+    && printf "Cleaned up image\n"
+
+# > Create non-root user
+RUN set -Eeuxo pipefail && \
+    printf "Creating non-root user\n" && \
+    groupadd -g 1000 ${RUNNER_USER} && \
+    useradd -u 1000 -g ${RUNNER_USER} -G sudo -m -s /bin/bash ${RUNNER_USER} && \
+    sed -i /etc/sudoers -re 's/^%sudo.*/%sudo ALL=(ALL:ALL) NOPASSWD: ALL/g' && \
+    sed -i /etc/sudoers -re 's/^root.*/root ALL=(ALL:ALL) NOPASSWD: ALL/g' && \
+    sed -i /etc/sudoers -re 's/^#includedir.*/## **Removed the include directive** ##"/g' && \
+    echo "${RUNNER_USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
+    printf "runner user: $(su - ${RUNNER_USER} -c id)\n" && \
+    printf "Created non-root user $(grep ${RUNNER_USER} /etc/passwd)\n"
+
+# > Home repository
+LABEL org.opencontainers.image.source="https://github.com/catthehacker/docker_images"
+
+# > Don't run as root, generally not good idea
+USER ${RUNNER_USER}:${RUNNER_USER}
+
+WORKDIR /home/runner
+
+SHELL [ "/bin/bash", "--login", "-c" ]
+
+# > Force bash with environment
+ENTRYPOINT [ "/bin/bash", "--login", "-c" ]