From 00383ef22dd47e0eb7502eb1d494b15e53683e54 Mon Sep 17 00:00:00 2001 From: Dimi Kot Date: Sun, 3 Mar 2024 01:45:31 -0800 Subject: [PATCH] Add gosu tool to the image for convenience --- docker/compose.yml | 2 ++ docker/host/Dockerfile | 2 +- docker/self-hosted-runner/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/compose.yml b/docker/compose.yml index d23b0e2..577c025 100644 --- 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 index c31e241..0513c6d 100644 --- 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 index 25488a0..2fba198 100644 --- 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