fix: respect PATH env variable for runitdir in alpine #152 (#153)

TugboatQA · Dec 11, 2024 · b1915a9 · b1915a9
1 parent 7b8b80a
commit b1915a9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/dist/runit-init.sh b/dist/runit-init.sh
@@ -2,7 +2,7 @@
 
 sv_stop() {
     for s in /etc/service/*; do
-        "$RUNITDIR"/sv stop "$s"
+        "$RUNITDIR"sv stop "$s"
     done
 }
 
@@ -12,5 +12,5 @@ trap "" SIGCHLD
 
 trap "sv_stop; exit" SIGTERM
 
-SVWAIT=60 "$RUNITDIR"/runsvdir -P /etc/service &
+SVWAIT=60 "$RUNITDIR"runsvdir -P /etc/service &
 wait
diff --git a/templates/Dockerfile.apk.template b/templates/Dockerfile.apk.template
@@ -10,7 +10,7 @@ RUN apk add --no-cache bash git openssh-client runit jq
 
 STOPSIGNAL SIGTERM
 
-ENV RUNITDIR=/sbin
+ENV RUNITDIR=
 
 COPY runit-init.sh /runit-init.sh
 

diff --git a/templates/Dockerfile.apt.template b/templates/Dockerfile.apt.template
@@ -50,7 +50,7 @@ RUN apt-get clean && \
 
 STOPSIGNAL SIGTERM
 
-ENV RUNITDIR=/usr/bin
+ENV RUNITDIR=/usr/bin/
 
 COPY runit-init.sh /runit-init.sh
 

diff --git a/templates/Dockerfile.yum.template b/templates/Dockerfile.yum.template
@@ -46,7 +46,7 @@ RUN yum clean all -y && \
 
 STOPSIGNAL SIGTERM
 
-ENV RUNITDIR=/usr/local/bin
+ENV RUNITDIR=/usr/local/bin/
 
 COPY runit-init.sh /runit-init.sh