Merge pull request #88 from seb-elico/9.0.1.0-boot-process

[MRG][9.0.1.0] Port #86
Elico-Corp · Aug 30, 2017 · 0f5328c · 0f5328c
2 parents 531a1c4 + aec57a4
commit 0f5328c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -116,7 +116,7 @@ VOLUME [ \
 # Use README for the help & man commands
 ADD README.md /usr/share/man/man.txt
 # Remove anchors and links to anchors to improve readability
-RUN sed -i '/^<a name="/ d' /usr/share/man/man.txt
+RUN sed -i '/^<a name=/ d' /usr/share/man/man.txt
 RUN sed -i -e 's/\[\^\]\[toc\]//g' /usr/share/man/man.txt
 RUN sed -i -e 's/\(\[.*\]\)(#.*)/\1/g' /usr/share/man/man.txt
 # For help command, only keep the "Usage" section
@@ -127,9 +127,12 @@ RUN from=$( awk '/^## Usage/{ print NR; exit }' /usr/share/man/man.txt ) && \
   tail -n +$from | \
   tee /usr/share/man/help.txt > /dev/null
 
-# Set the default entrypoint (non overridable) to run when starting the container
-ADD bin /app/bin/
-ENTRYPOINT [ "/app/bin/boot" ]
+# Use dumb-init as init system to launch the boot script
+ADD https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb /opt/sources/dumb-init.deb
+RUN dpkg -i /opt/sources/dumb-init.deb
+ADD boot /usr/bin/boot
+RUN chmod +x /usr/bin/boot
+ENTRYPOINT [ "/usr/bin/dumb-init", "/usr/bin/boot" ]
 CMD [ "help" ]
 
 # Expose the odoo ports (for linked containers)

diff --git a/bin/boot b/bin/boot
@@ -197,4 +197,5 @@ function start {
 }
 
 # Run command
-"$*"
+$*
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -197,4 +197,5 @@ function start { @@
     }
     # Run command
-    "$*"
+    $*