fix: worker s6 v3

pabloromeo · Jul 23, 2024 · d694bf3 · d694bf3
1 parent 5cf6556
commit d694bf3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/...t/etc/cont-init.d/92-install-dependencies → .../_old_cont-init.d/92-install-dependencies b/...t/etc/cont-init.d/92-install-dependencies → .../_old_cont-init.d/92-install-dependencies
diff --git a/...r-mod/root/etc/cont-init.d/93-npm-install → ...ocker-mod/_old_cont-init.d/93-npm-install b/...r-mod/root/etc/cont-init.d/93-npm-install → ...ocker-mod/_old_cont-init.d/93-npm-install
diff --git a/...-mod/root/etc/cont-init.d/94-install-shim → ...cker-mod/_old_cont-init.d/94-install-shim b/...-mod/root/etc/cont-init.d/94-install-shim → ...cker-mod/_old_cont-init.d/94-install-shim
diff --git a/.../root/etc/cont-init.d/95-setup-codecs-dir → ...-mod/_old_cont-init.d/95-setup-codecs-dir b/.../root/etc/cont-init.d/95-setup-codecs-dir → ...-mod/_old_cont-init.d/95-setup-codecs-dir
diff --git a/worker/extended-image/Dockerfile b/worker/extended-image/Dockerfile
@@ -5,10 +5,14 @@ LABEL maintainer="pabloromeo"
 COPY /docker-mod/root/etc/ /etc/
 COPY /app /app
 
-RUN bash /etc/cont-init.d/92-install-dependencies && \
-    bash /etc/cont-init.d/93-npm-install && \
-    rm /etc/cont-init.d/92-install-dependencies && \
-    rm /etc/cont-init.d/93-npm-install && \
+RUN bash /etc/s6-overlay/s6-rc.d/1-install-dependencies/run && \
+    bash /etc/s6-overlay/s6-rc.d/2-npm-install/run && \
+    rm -rf /etc/s6-overlay/s6-rc.d/1-install-dependencies && \
+    rm -rf /etc/s6-overlay/s6-rc.d/2-npm-install && \
+    rm -rf /etc/s6-overlay/s6-rc.d/3-install-shim/dependencies.d && \
+    rm -rf /etc/s6-overlay/s6-rc.d/4-setup-codecs-dir/dependencies.d && \
+    rm /etc/s6-overlay/s6-rc.d/user/contents.d/1-install-dependencies && \
+    rm /etc/s6-overlay/s6-rc.d/user/contents.d/2-npm-install && \
     echo "**** cleanup ****" && \
     rm -rf \
     /tmp/* \