Add gosu tool to the image for convenience

dimikot · Mar 3, 2024 · 00383ef · 00383ef
1 parent eeaebcf
commit 00383ef
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/docker/compose.yml b/docker/compose.yml
@@ -4,6 +4,7 @@ services:
     build:
       context: host
       dockerfile: Dockerfile
+    stop_grace_period: 1m
     healthcheck:
       test: ["CMD", "bash", "-c", "netstat -ltn | grep -c :22"]
       interval: 1s
@@ -17,6 +18,7 @@ services:
     build:
       context: self-hosted-runner
       dockerfile: Dockerfile
+    stop_grace_period: 1m
     depends_on:
       host:
         condition: service_healthy

diff --git a/docker/host/Dockerfile b/docker/host/Dockerfile
@@ -9,7 +9,7 @@ RUN true \
     && apt-get update -y \
     && apt-get install -y --no-install-recommends \
       openssh-server \
-      jq gh rsync python3 rinetd mc git curl wget pv psmisc unzip vim nano telnet net-tools apt-transport-https ca-certificates locales \
+      jq gh rsync python3 rinetd gosu mc git curl wget pv psmisc unzip vim nano telnet net-tools apt-transport-https ca-certificates locales \
     && sed -i -e "s|#PermitRootLogin.*|PermitRootLogin no|" /etc/ssh/sshd_config \
     && useradd -m user \
     && mkdir -p ~user/.ssh ~user/ci-storage \

diff --git a/docker/self-hosted-runner/Dockerfile b/docker/self-hosted-runner/Dockerfile
@@ -14,7 +14,7 @@ RUN true \
     && apt-get update -y \
     && apt-get install -y --no-install-recommends \
       openssh-client \
-      jq gh rsync python3 rinetd mc git curl wget pv psmisc unzip vim nano telnet net-tools apt-transport-https ca-certificates locales \
+      jq gh rsync python3 rinetd gosu mc git curl wget pv psmisc unzip vim nano telnet net-tools apt-transport-https ca-certificates locales \
     && useradd -m user
 
 USER user