Generalize s6 services usage

manala · Feb 17, 2024 · 2306ea5 · 2306ea5
1 parent 02b074e
commit 2306ea5
Show file tree

Hide file tree

Showing 22 changed files with 93 additions and 83 deletions.
diff --git a/lazy.ansible/.manala.yaml b/lazy.ansible/.manala.yaml
@@ -7,6 +7,7 @@ manala:
       - .manala/github
       - .manala/gitlab
       - .manala/make
+      - .manala/services
       - .manala/.dockerignore
       - .manala/.gitignore
       - .manala/Makefile.tmpl

diff --git a/lazy.ansible/.manala/docker/Dockerfile.tmpl b/lazy.ansible/.manala/docker/Dockerfile.tmpl
@@ -64,6 +64,11 @@ RUN \
     # Clean
     && rm -rf /var/lib/apt/lists/*
 
+# Services
+COPY services/.s6-svscan /etc/services/enabled/.s6-svscan
+COPY services/docker-bridge /etc/services/available/docker-bridge
+COPY services/ssh-agent-bridge /etc/services/available/ssh-agent-bridge
+
 ##########
 # System #
 ##########

diff --git a/lazy.ansible/.manala/docker/entrypoint.sh b/lazy.ansible/.manala/docker/entrypoint.sh
@@ -2,30 +2,6 @@
 
 set -e
 
-# Ssh agent bridge
-if [ -n "${SSH_AUTH_SOCK}" ]; then
-  sh -c " \
-    while sleep 1; do \
-      rm -f /var/run/ssh-auth-bridge.sock ;
-      socat \
-        UNIX-LISTEN:/var/run/ssh-auth-bridge.sock,fork,mode=777 \
-        UNIX-CONNECT:/var/run/ssh-auth.sock ; \
-    done \
-  " &
-fi
-
-# Docker bridge
-if [ -n "${DOCKER_HOST}" ]; then
-  sh -c " \
-    while sleep 1; do \
-      rm -f /var/run/docker-bridge.sock ;
-      socat -t 600 \
-        UNIX-LISTEN:/var/run/docker-bridge.sock,fork,mode=777 \
-        UNIX-CONNECT:/var/run/docker.sock ; \
-    done \
-  " &
-fi
-
 # As a consequence of running the container as root user,
 # tty is not writable by sued user
 if [ -t 1 ]; then
@@ -48,10 +24,18 @@ if [ -d ".manala/etc" ]; then
   GOMPLATE_LOG_FORMAT=simple gomplate --input-dir=.manala/etc --output-dir=/etc 2>/dev/null
 fi
 
-# Services
-if [ $# -eq 0 ] && [ -d "/etc/services.d" ]; then
-    exec s6-svscan /etc/services.d
+# Docker bridge
+if [ -n "${DOCKER_HOST}" ]; then
+  ln --symbolic /etc/services/available/docker-bridge /etc/services/enabled/
+fi
+
+# Ssh agent bridge
+if [ -n "${SSH_AUTH_SOCK}" ]; then
+  ln --symbolic /etc/services/available/ssh-agent-bridge /etc/services/enabled/
 fi
 
+# Services
+exec s6-svscan /etc/services/enabled &
+
 # Command
 exec gosu lazy "$@"
diff --git a/.../.manala/etc/services.d/.s6-svscan/finish → ...nsible/.manala/services/.s6-svscan/finish b/.../.manala/etc/services.d/.s6-svscan/finish → ...nsible/.manala/services/.s6-svscan/finish
@@ -1,2 +1,3 @@
 #!/bin/sh
+
 exit 0
diff --git a/lazy.ansible/.manala/services/docker-bridge/run b/lazy.ansible/.manala/services/docker-bridge/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec socat \
+    UNIX-LISTEN:/var/run/docker-bridge.sock,fork,unlink-early,mode=777 \
+    UNIX-CONNECT:/var/run/docker.sock
diff --git a/lazy.ansible/.manala/services/ssh-agent-bridge/run b/lazy.ansible/.manala/services/ssh-agent-bridge/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec socat \
+    UNIX-LISTEN:/var/run/ssh-auth-bridge.sock,fork,unlink-early,mode=777 \
+    UNIX-CONNECT:/var/run/ssh-auth.sock
diff --git a/lazy.kubernetes/.manala.yaml b/lazy.kubernetes/.manala.yaml
@@ -7,6 +7,7 @@ manala:
       - .manala/github
       - .manala/gitlab
       - .manala/make
+      - .manala/services
       - .manala/.dockerignore
       - .manala/.gitignore
       - .manala/Makefile.tmpl

diff --git a/lazy.kubernetes/.manala/docker/Dockerfile.tmpl b/lazy.kubernetes/.manala/docker/Dockerfile.tmpl
@@ -64,6 +64,11 @@ RUN \
     # Clean
     && rm -rf /var/lib/apt/lists/*
 
+# Services
+COPY services/.s6-svscan /etc/services/enabled/.s6-svscan
+COPY services/docker-bridge /etc/services/available/docker-bridge
+COPY services/ssh-agent-bridge /etc/services/available/ssh-agent-bridge
+
 ##########
 # System #
 ##########

diff --git a/lazy.kubernetes/.manala/docker/entrypoint.sh b/lazy.kubernetes/.manala/docker/entrypoint.sh
@@ -2,30 +2,6 @@
 
 set -e
 
-# Ssh agent bridge
-if [ -n "${SSH_AUTH_SOCK}" ]; then
-  sh -c " \
-    while sleep 1; do \
-      rm -f /var/run/ssh-auth-bridge.sock ;
-      socat \
-        UNIX-LISTEN:/var/run/ssh-auth-bridge.sock,fork,mode=777 \
-        UNIX-CONNECT:/var/run/ssh-auth.sock ; \
-    done \
-  " &
-fi
-
-# Docker bridge
-if [ -n "${DOCKER_HOST}" ]; then
-  sh -c " \
-    while sleep 1; do \
-      rm -f /var/run/docker-bridge.sock ;
-      socat -t 600 \
-        UNIX-LISTEN:/var/run/docker-bridge.sock,fork,mode=777 \
-        UNIX-CONNECT:/var/run/docker.sock ; \
-    done \
-  " &
-fi
-
 # As a consequence of running the container as root user,
 # tty is not writable by sued user
 if [ -t 1 ]; then
@@ -48,10 +24,18 @@ if [ -d ".manala/etc" ]; then
   GOMPLATE_LOG_FORMAT=simple gomplate --input-dir=.manala/etc --output-dir=/etc 2>/dev/null
 fi
 
-# Services
-if [ $# -eq 0 ] && [ -d "/etc/services.d" ]; then
-    exec s6-svscan /etc/services.d
+# Docker bridge
+if [ -n "${DOCKER_HOST}" ]; then
+  ln --symbolic /etc/services/available/docker-bridge /etc/services/enabled/
+fi
+
+# Ssh agent bridge
+if [ -n "${SSH_AUTH_SOCK}" ]; then
+  ln --symbolic /etc/services/available/ssh-agent-bridge /etc/services/enabled/
 fi
 
+# Services
+exec s6-svscan /etc/services/enabled &
+
 # Command
 exec gosu lazy "$@"
diff --git a/lazy.kubernetes/.manala/services/.s6-svscan/finish b/lazy.kubernetes/.manala/services/.s6-svscan/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exit 0
diff --git a/lazy.kubernetes/.manala/services/docker-bridge/run b/lazy.kubernetes/.manala/services/docker-bridge/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec socat \
+    UNIX-LISTEN:/var/run/docker-bridge.sock,fork,unlink-early,mode=777 \
+    UNIX-CONNECT:/var/run/docker.sock
diff --git a/lazy.kubernetes/.manala/services/ssh-agent-bridge/run b/lazy.kubernetes/.manala/services/ssh-agent-bridge/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec socat \
+    UNIX-LISTEN:/var/run/ssh-auth-bridge.sock,fork,unlink-early,mode=777 \
+    UNIX-CONNECT:/var/run/ssh-auth.sock
diff --git a/lazy.symfony/.manala.yaml b/lazy.symfony/.manala.yaml
@@ -8,6 +8,7 @@ manala:
       - .manala/github
       - .manala/gitlab
       - .manala/make
+      - .manala/services
       - .manala/.dockerignore
       - .manala/.gitignore
       - .manala/Makefile.tmpl

diff --git a/lazy.symfony/.manala/docker/Dockerfile.tmpl b/lazy.symfony/.manala/docker/Dockerfile.tmpl
@@ -64,6 +64,11 @@ RUN \
     # Clean
     && rm -rf /var/lib/apt/lists/*
 
+# Services
+COPY services/.s6-svscan /etc/services/enabled/.s6-svscan
+COPY services/docker-bridge /etc/services/available/docker-bridge
+COPY services/ssh-agent-bridge /etc/services/available/ssh-agent-bridge
+
 ##########
 # System #
 ##########
@@ -133,6 +138,8 @@ Pin-Priority: 1000\n\
     # Clean
     && rm -rf /var/lib/apt/lists/*
 
+COPY services/nginx /etc/services/enabled/nginx
+
 # Php
 {{ $php := .Vars.system.php -}}
 RUN \
@@ -174,6 +181,8 @@ Signed-By: /etc/apt/keyrings/sury_php.gpg\n\
     # Clean
     && rm -rf /var/lib/apt/lists/*
 
+COPY services/php /etc/services/enabled/php
+
 {{ $nodejs := .Vars.system.nodejs -}}
 {{ if $nodejs.version -}}
 # Nodejs

diff --git a/lazy.symfony/.manala/docker/entrypoint.sh b/lazy.symfony/.manala/docker/entrypoint.sh
@@ -2,30 +2,6 @@
 
 set -e
 
-# Ssh agent bridge
-if [ -n "${SSH_AUTH_SOCK}" ]; then
-  sh -c " \
-    while sleep 1; do \
-      rm -f /var/run/ssh-auth-bridge.sock ;
-      socat \
-        UNIX-LISTEN:/var/run/ssh-auth-bridge.sock,fork,mode=777 \
-        UNIX-CONNECT:/var/run/ssh-auth.sock ; \
-    done \
-  " &
-fi
-
-# Docker bridge
-if [ -n "${DOCKER_HOST}" ]; then
-  sh -c " \
-    while sleep 1; do \
-      rm -f /var/run/docker-bridge.sock ;
-      socat -t 600 \
-        UNIX-LISTEN:/var/run/docker-bridge.sock,fork,mode=777 \
-        UNIX-CONNECT:/var/run/docker.sock ; \
-    done \
-  " &
-fi
-
 # As a consequence of running the container as root user,
 # tty is not writable by sued user
 if [ -t 1 ]; then
@@ -48,10 +24,15 @@ if [ -d ".manala/etc" ]; then
   GOMPLATE_LOG_FORMAT=simple gomplate --input-dir=.manala/etc --output-dir=/etc 2>/dev/null
 fi
 
-# Services
-if [ $# -eq 0 ] && [ -d "/etc/services.d" ]; then
-    exec s6-svscan /etc/services.d
+# Docker bridge
+if [ -n "${DOCKER_HOST}" ]; then
+  ln --symbolic /etc/services/available/docker-bridge /etc/services/enabled/
+fi
+
+# Ssh agent bridge
+if [ -n "${SSH_AUTH_SOCK}" ]; then
+  ln --symbolic /etc/services/available/ssh-agent-bridge /etc/services/enabled/
 fi
 
-# Command
-exec gosu lazy "$@"
+# Services
+exec s6-svscan /etc/services/enabled
diff --git a/lazy.symfony/.manala/services/.s6-svscan/finish b/lazy.symfony/.manala/services/.s6-svscan/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exit 0
diff --git a/lazy.symfony/.manala/services/docker-bridge/run b/lazy.symfony/.manala/services/docker-bridge/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec socat \
+    UNIX-LISTEN:/var/run/docker-bridge.sock,fork,unlink-early,mode=777 \
+    UNIX-CONNECT:/var/run/docker.sock
diff --git a/.../.manala/etc/services.d/nginx/down-signal → ...ymfony/.manala/services/nginx/down-signal b/.../.manala/etc/services.d/nginx/down-signal → ...ymfony/.manala/services/nginx/down-signal
diff --git a/....symfony/.manala/etc/services.d/nginx/run → lazy.symfony/.manala/services/nginx/run b/....symfony/.manala/etc/services.d/nginx/run → lazy.symfony/.manala/services/nginx/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+
 exec nginx -c /etc/nginx/project.conf
diff --git a/...ny/.manala/etc/services.d/php/down-signal → ....symfony/.manala/services/php/down-signal b/...ny/.manala/etc/services.d/php/down-signal → ....symfony/.manala/services/php/down-signal
diff --git a/lazy.symfony/.manala/etc/services.d/php/run → lazy.symfony/.manala/services/php/run b/lazy.symfony/.manala/etc/services.d/php/run → lazy.symfony/.manala/services/php/run
@@ -1,2 +1,3 @@
 #!/bin/sh
+
 exec php-fpm --fpm-config /etc/php/default/fpm/project.conf
diff --git a/lazy.symfony/.manala/services/ssh-agent-bridge/run b/lazy.symfony/.manala/services/ssh-agent-bridge/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec socat \
+    UNIX-LISTEN:/var/run/ssh-auth-bridge.sock,fork,unlink-early,mode=777 \
+    UNIX-CONNECT:/var/run/ssh-auth.sock