Skip to content

Commit 9a7572a

Browse files
mlima95moufmouf
mlima95
authored and
moufmouf
committed
Add tini to catch signal
1 parent 59ba44e commit 9a7572a

8 files changed

+36
-8
lines changed

‎Dockerfile.14-apache-bullseye‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <
1010
# |
1111

1212
RUN apt-get update &&\
13-
apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig --no-install-recommends
13+
apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig tini --no-install-recommends
1414

1515
# |--------------------------------------------------------------------------
1616
# | Supercronic
@@ -186,12 +186,15 @@ RUN mkdir -p /var/www/html && chown docker:docker /var/www/html
186186
WORKDIR /var/www/html
187187

188188

189+
190+
189191
COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
190192
COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
191193
COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
192194
COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
193195

194196

197+
195198
COPY utils/enable_apache_mods.js /usr/local/bin/enable_apache_mods.js
196199
COPY utils/apache-expose-envvars.sh /usr/local/bin/apache-expose-envvars.sh
197200

@@ -221,4 +224,5 @@ CMD ["apache2-foreground"]
221224

222225
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
223226

227+
224228
USER docker

‎Dockerfile.14-bullseye‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <
1010
# |
1111

1212
RUN apt-get update &&\
13-
apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig --no-install-recommends
13+
apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig tini --no-install-recommends
1414

1515
# |--------------------------------------------------------------------------
1616
# | Supercronic
@@ -116,17 +116,21 @@ RUN mkdir -p /usr/src/app && chown docker:docker /usr/src/app
116116
WORKDIR /usr/src/app
117117

118118

119+
120+
119121
COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
120122
COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
121123
COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
122124
COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
123125

124126

127+
125128
CMD [ "node" ]
126129

127130

128131

129132

130133
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
131134

135+
132136
USER docker

‎Dockerfile.16-apache-bullseye‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <
1010
# |
1111

1212
RUN apt-get update &&\
13-
apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig --no-install-recommends
13+
apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig tini --no-install-recommends
1414

1515
# |--------------------------------------------------------------------------
1616
# | Supercronic
@@ -186,12 +186,15 @@ RUN mkdir -p /var/www/html && chown docker:docker /var/www/html
186186
WORKDIR /var/www/html
187187

188188

189+
190+
189191
COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
190192
COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
191193
COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
192194
COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
193195

194196

197+
195198
COPY utils/enable_apache_mods.js /usr/local/bin/enable_apache_mods.js
196199
COPY utils/apache-expose-envvars.sh /usr/local/bin/apache-expose-envvars.sh
197200

@@ -221,4 +224,5 @@ CMD ["apache2-foreground"]
221224

222225
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
223226

227+
224228
USER docker

‎Dockerfile.16-bullseye‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <
1010
# |
1111

1212
RUN apt-get update &&\
13-
apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig --no-install-recommends
13+
apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig tini --no-install-recommends
1414

1515
# |--------------------------------------------------------------------------
1616
# | Supercronic
@@ -116,17 +116,21 @@ RUN mkdir -p /usr/src/app && chown docker:docker /usr/src/app
116116
WORKDIR /usr/src/app
117117

118118

119+
120+
119121
COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
120122
COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
121123
COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
122124
COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
123125

124126

127+
125128
CMD [ "node" ]
126129

127130

128131

129132

130133
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
131134

135+
132136
USER docker

‎Dockerfile.18-apache-bullseye‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <
1010
# |
1111

1212
RUN apt-get update &&\
13-
apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig --no-install-recommends
13+
apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig tini --no-install-recommends
1414

1515
# |--------------------------------------------------------------------------
1616
# | Supercronic
@@ -186,12 +186,15 @@ RUN mkdir -p /var/www/html && chown docker:docker /var/www/html
186186
WORKDIR /var/www/html
187187

188188

189+
190+
189191
COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
190192
COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
191193
COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
192194
COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
193195

194196

197+
195198
COPY utils/enable_apache_mods.js /usr/local/bin/enable_apache_mods.js
196199
COPY utils/apache-expose-envvars.sh /usr/local/bin/apache-expose-envvars.sh
197200

@@ -221,4 +224,5 @@ CMD ["apache2-foreground"]
221224

222225
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
223226

227+
224228
USER docker

‎Dockerfile.18-bullseye‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <
1010
# |
1111

1212
RUN apt-get update &&\
13-
apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig --no-install-recommends
13+
apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig tini --no-install-recommends
1414

1515
# |--------------------------------------------------------------------------
1616
# | Supercronic
@@ -116,17 +116,21 @@ RUN mkdir -p /usr/src/app && chown docker:docker /usr/src/app
116116
WORKDIR /usr/src/app
117117

118118

119+
120+
119121
COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
120122
COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
121123
COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
122124
COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
123125

124126

127+
125128
CMD [ "node" ]
126129

127130

128131

129132

130133
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
131134

135+
132136
USER docker

‎utils/Dockerfile.blueprint‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LABEL authors="Julien Neuhart <j.neuhart@thecodingmachine.com>, David Négrier <
1414
# |
1515

1616
RUN apt-get update &&\
17-
apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig --no-install-recommends
17+
apt-get install -y --no-install-recommends curl git nano sudo ca-certificates procps libfontconfig tini --no-install-recommends
1818

1919
# |--------------------------------------------------------------------------
2020
# | Supercronic
@@ -193,11 +193,14 @@ RUN mkdir -p /var/www/html && chown docker:docker /var/www/html
193193
WORKDIR /var/www/html
194194
{{ end }}
195195

196+
197+
196198
COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
197199
COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
198200
COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
199201
COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
200202

203+
201204
{{ if eq $variant "apache" }}
202205
COPY utils/enable_apache_mods.js /usr/local/bin/enable_apache_mods.js
203206
COPY utils/apache-expose-envvars.sh /usr/local/bin/apache-expose-envvars.sh
@@ -230,4 +233,5 @@ CMD [ "node" ]
230233

231234
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
232235

236+
233237
USER docker

‎utils/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
set -e
44

5-
exec "sudo" "-E" "/usr/local/bin/docker-entrypoint-as-root.sh" "$@";
5+
exec "sudo" "-E" "tini" "-s" "-v" "--" "/usr/local/bin/docker-entrypoint-as-root.sh" "$@";

0 commit comments

Comments
 (0)