Change CMD shell form to exec form to detecting OS signals correctly,…

… change ENV var declaration to ENV="var"
diegogslomp · Aug 12, 2024 · 8d94f99 · 8d94f99
1 parent 01125f5
commit 8d94f99
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 24 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -25,7 +25,7 @@ services:
       - "DC2 DC2.dgs.net:172.16.238.20"
       - "DC3 DC3.dgs.net:172.16.238.30"
       - "DC4 DC4.dgs.net:172.16.238.40"
-    command: bash -c "samba-domain-provision && samba -F"
+    command: ["/bin/bash", "-c", "samba-domain-provision && samba -F"]
     volumes:
       - dc1_etc:/usr/local/samba/etc
       - dc1_private:/usr/local/samba/private
@@ -61,7 +61,7 @@ services:
       - "DC2 DC2.dgs.net:172.16.238.20"
       - "DC3 DC3.dgs.net:172.16.238.30"
       - "DC4 DC4.dgs.net:172.16.238.40"
-    command: bash -c "samba-domain-join DC1 && samba -F"
+    command: ["/bin/bash", "-c", "samba-domain-join DC1 && samba -F"]
     volumes:
       - dc2_etc:/usr/local/samba/etc
       - dc2_private:/usr/local/samba/private
@@ -96,7 +96,7 @@ services:
       - "DC2 DC2.dgs.net:172.16.238.20"
       - "DC3 DC3.dgs.net:172.16.238.30"
       - "DC4 DC4.dgs.net:172.16.238.40"
-    command: bash -c "samba-domain-join DC1 && samba -F"
+    command: ["/bin/bash", "-c", "samba-domain-join DC1 && samba -F"]
     volumes:
       - dc3_etc:/usr/local/samba/etc
       - dc3_private:/usr/local/samba/private
@@ -131,7 +131,7 @@ services:
       - "DC2 DC2.dgs.net:172.16.238.20"
       - "DC3 DC3.dgs.net:172.16.238.30"
       - "DC4 DC4.dgs.net:172.16.238.40"
-    command: bash -c "samba-domain-join DC1 && samba -F"
+    command: ["/bin/bash", "-c", "samba-domain-join DC1 && samba -F"]
     volumes:
       - dc4_etc:/usr/local/samba/etc
       - dc4_private:/usr/local/samba/private

diff --git a/dockerfiles/almalinux b/dockerfiles/almalinux
@@ -66,16 +66,17 @@ RUN ./configure && \
 
 FROM base
 
-ENV PATH /usr/local/samba/bin:/usr/local/samba/sbin:$PATH
-ENV LC_CTYPE C.UTF-8
-ENV LC_MESSAGES C.UTF-8
-ENV LC_ALL C.UTF-8
+ENV PATH="/usr/local/samba/bin:/usr/local/samba/sbin:${PATH}"
+ENV LC_CTYPE="C.UTF-8"
+ENV LC_MESSAGES="C.UTF-8"
+ENV LC_ALL="C.UTF-8"
 
 COPY --from=compiled /usr/local/samba /usr/local/samba
 
 WORKDIR /usr/local/sbin
 COPY sbin /usr/local/sbin
-CMD bash -c "samba-domain-provision && samba -F"
+
+CMD ["/bin/bash", "-c", "samba-domain-provision && samba -F"]
 
 VOLUME /usr/local/samba/etc
 VOLUME /usr/local/samba/private

diff --git a/dockerfiles/debian b/dockerfiles/debian
@@ -74,16 +74,17 @@ RUN ./configure && \
 
 FROM base
 
-ENV PATH /usr/local/samba/bin:/usr/local/samba/sbin:$PATH
-ENV LC_CTYPE C.UTF-8
-ENV LC_MESSAGES C.UTF-8
-ENV LC_ALL C.UTF-8
+ENV PATH="/usr/local/samba/bin:/usr/local/samba/sbin:${PATH}"
+ENV LC_CTYPE="C.UTF-8"
+ENV LC_MESSAGES="C.UTF-8"
+ENV LC_ALL="C.UTF-8"
 
 COPY --from=compiled /usr/local/samba /usr/local/samba
 
 WORKDIR /usr/local/sbin
 COPY sbin /usr/local/sbin
-CMD bash -c "samba-domain-provision && samba -F"
+
+CMD ["/bin/bash", "-c", "samba-domain-provision && samba -F"]
 
 VOLUME /usr/local/samba/etc
 VOLUME /usr/local/samba/private

diff --git a/dockerfiles/rockylinux b/dockerfiles/rockylinux
@@ -66,16 +66,17 @@ RUN ./configure && \
 
 FROM base
 
-ENV PATH /usr/local/samba/bin:/usr/local/samba/sbin:$PATH
-ENV LC_CTYPE C.UTF-8
-ENV LC_MESSAGES C.UTF-8
-ENV LC_ALL C.UTF-8
+ENV PATH="/usr/local/samba/bin:/usr/local/samba/sbin:${PATH}"
+ENV LC_CTYPE="C.UTF-8"
+ENV LC_MESSAGES="C.UTF-8"
+ENV LC_ALL="C.UTF-8"
 
 COPY --from=compiled /usr/local/samba /usr/local/samba
 
 WORKDIR /usr/local/sbin
 COPY sbin /usr/local/sbin
-CMD bash -c "samba-domain-provision && samba -F"
+
+CMD ["/bin/bash", "-c", "samba-domain-provision && samba -F"]
 
 VOLUME /usr/local/samba/etc
 VOLUME /usr/local/samba/private

diff --git a/dockerfiles/ubuntu b/dockerfiles/ubuntu
@@ -74,16 +74,17 @@ RUN ./configure && \
 
 FROM base
 
-ENV PATH /usr/local/samba/bin:/usr/local/samba/sbin:$PATH
-ENV LC_CTYPE C.UTF-8
-ENV LC_MESSAGES C.UTF-8
-ENV LC_ALL C.UTF-8
+ENV PATH="/usr/local/samba/bin:/usr/local/samba/sbin:${PATH}"
+ENV LC_CTYPE="C.UTF-8"
+ENV LC_MESSAGES="C.UTF-8"
+ENV LC_ALL="C.UTF-8"
 
 COPY --from=compiled /usr/local/samba /usr/local/samba
 
 WORKDIR /usr/local/sbin
 COPY sbin /usr/local/sbin
-CMD bash -c "samba-domain-provision && samba -F"
+
+CMD ["/bin/bash", "-c", "samba-domain-provision && samba -F"]
 
 VOLUME /usr/local/samba/etc
 VOLUME /usr/local/samba/private