From 3d320a1d9c6890e2accca41e8168104cade30be2 Mon Sep 17 00:00:00 2001 From: dmeenaarmorcode Date: Fri, 28 Nov 2025 09:08:16 +0530 Subject: [PATCH 1/3] Correcting mounting and ownership order in ssh-agent --- Dockerfile | 14 ++++++++++---- docker-compose.yml | 4 +--- supervisord.conf.sample | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index e46f532..840c353 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,13 +2,19 @@ FROM alpine:latest RUN apk update && \ apk upgrade && \ - apk add --no-cache autossh supervisor openssl && \ - rm -rf /var/cache/apk/* + apk add --no-cache autossh supervisor openssl && \ + rm -rf /var/cache/apk/* && \ + adduser -D appuser + RUN mkdir /etc/armorcode -RUN adduser -D appuser +COPY /* /etc/armorcode/ + +RUN chown -R appuser:appuser /etc/armorcode + +RUN touch /supervisord.log /supervisord.pid -RUN chown -R appuser /etc/armorcode +RUN chown appuser:appuser /supervisord.log /supervisord.pid USER appuser diff --git a/docker-compose.yml b/docker-compose.yml index 022d49b..e09e079 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,6 +2,4 @@ version: "3.9" services: armorcode-tunnel-1: build: . - restart: always - volumes: - - .:/etc/armorcode \ No newline at end of file + restart: always \ No newline at end of file diff --git a/supervisord.conf.sample b/supervisord.conf.sample index 3258fea..a83add2 100644 --- a/supervisord.conf.sample +++ b/supervisord.conf.sample @@ -2,8 +2,8 @@ [program:ACCESS_JIRA] command=/usr/bin/autossh -M 0 -N -R *:5000:jira.acme.com:443 -i /etc/armorcode/private-key.pem -o "ServerAliveInterval=30" -o "ServerAliveCountMax=3" -o "StrictHostKeyChecking=no" ssh-user@ -user=ssh-user +user=appuser [program:ACCESS_SONARQUBE] command=/usr/bin/autossh -M 0 -N -R *:5001:sonar.acme.com:443 -i /etc/armorcode/private-key.pem -o "ServerAliveInterval=30" -o "ServerAliveCountMax=3" -o "StrictHostKeyChecking=no" ssh-user@ -user=ssh-user +user=appuser From c00b1e4b711207b55b5cfb45ba534d1ddabff545 Mon Sep 17 00:00:00 2001 From: dmeenaarmorcode Date: Fri, 28 Nov 2025 10:02:08 +0530 Subject: [PATCH 2/3] Correcting mounting and ownership order in ssh-agent --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 840c353..711779a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,8 @@ COPY /* /etc/armorcode/ RUN chown -R appuser:appuser /etc/armorcode +RUN sed -i 's/user=root/user=appuser/g' /etc/armorcode/supervisord.conf + RUN touch /supervisord.log /supervisord.pid RUN chown appuser:appuser /supervisord.log /supervisord.pid From 4d39970fe041d214c33a5cdb2797afd7af2f5355 Mon Sep 17 00:00:00 2001 From: dmeenaarmorcode Date: Fri, 28 Nov 2025 10:05:42 +0530 Subject: [PATCH 3/3] Correcting mounting and ownership order in ssh-agent --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 711779a..91bbffd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ COPY /* /etc/armorcode/ RUN chown -R appuser:appuser /etc/armorcode -RUN sed -i 's/user=root/user=appuser/g' /etc/armorcode/supervisord.conf +RUN sed -i 's/user\s*=\s*root/user=appuser/g' /etc/armorcode/supervisord.conf RUN touch /supervisord.log /supervisord.pid