File tree Expand file tree Collapse file tree 8 files changed +36
-8
lines changed Expand file tree Collapse file tree 8 files changed +36
-8
lines changed Original file line number Diff line number Diff line change 10
10
# |
11
11
12
12
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
14
14
15
15
# |--------------------------------------------------------------------------
16
16
# | Supercronic
@@ -186,12 +186,15 @@ RUN mkdir -p /var/www/html && chown docker:docker /var/www/html
186
186
WORKDIR /var/www/html
187
187
188
188
189
+
190
+
189
191
COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
190
192
COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
191
193
COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
192
194
COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
193
195
194
196
197
+
195
198
COPY utils/enable_apache_mods.js /usr/local/bin/enable_apache_mods.js
196
199
COPY utils/apache-expose-envvars.sh /usr/local/bin/apache-expose-envvars.sh
197
200
@@ -221,4 +224,5 @@ CMD ["apache2-foreground"]
221
224
222
225
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
223
226
227
+
224
228
USER docker
Original file line number Diff line number Diff line change 10
10
# |
11
11
12
12
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
14
14
15
15
# |--------------------------------------------------------------------------
16
16
# | Supercronic
@@ -116,17 +116,21 @@ RUN mkdir -p /usr/src/app && chown docker:docker /usr/src/app
116
116
WORKDIR /usr/src/app
117
117
118
118
119
+
120
+
119
121
COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
120
122
COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
121
123
COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
122
124
COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
123
125
124
126
127
+
125
128
CMD [ "node" ]
126
129
127
130
128
131
129
132
130
133
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
131
134
135
+
132
136
USER docker
Original file line number Diff line number Diff line change 10
10
# |
11
11
12
12
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
14
14
15
15
# |--------------------------------------------------------------------------
16
16
# | Supercronic
@@ -186,12 +186,15 @@ RUN mkdir -p /var/www/html && chown docker:docker /var/www/html
186
186
WORKDIR /var/www/html
187
187
188
188
189
+
190
+
189
191
COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
190
192
COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
191
193
COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
192
194
COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
193
195
194
196
197
+
195
198
COPY utils/enable_apache_mods.js /usr/local/bin/enable_apache_mods.js
196
199
COPY utils/apache-expose-envvars.sh /usr/local/bin/apache-expose-envvars.sh
197
200
@@ -221,4 +224,5 @@ CMD ["apache2-foreground"]
221
224
222
225
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
223
226
227
+
224
228
USER docker
Original file line number Diff line number Diff line change 10
10
# |
11
11
12
12
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
14
14
15
15
# |--------------------------------------------------------------------------
16
16
# | Supercronic
@@ -116,17 +116,21 @@ RUN mkdir -p /usr/src/app && chown docker:docker /usr/src/app
116
116
WORKDIR /usr/src/app
117
117
118
118
119
+
120
+
119
121
COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
120
122
COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
121
123
COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
122
124
COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
123
125
124
126
127
+
125
128
CMD [ "node" ]
126
129
127
130
128
131
129
132
130
133
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
131
134
135
+
132
136
USER docker
Original file line number Diff line number Diff line change 10
10
# |
11
11
12
12
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
14
14
15
15
# |--------------------------------------------------------------------------
16
16
# | Supercronic
@@ -186,12 +186,15 @@ RUN mkdir -p /var/www/html && chown docker:docker /var/www/html
186
186
WORKDIR /var/www/html
187
187
188
188
189
+
190
+
189
191
COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
190
192
COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
191
193
COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
192
194
COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
193
195
194
196
197
+
195
198
COPY utils/enable_apache_mods.js /usr/local/bin/enable_apache_mods.js
196
199
COPY utils/apache-expose-envvars.sh /usr/local/bin/apache-expose-envvars.sh
197
200
@@ -221,4 +224,5 @@ CMD ["apache2-foreground"]
221
224
222
225
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
223
226
227
+
224
228
USER docker
Original file line number Diff line number Diff line change 10
10
# |
11
11
12
12
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
14
14
15
15
# |--------------------------------------------------------------------------
16
16
# | Supercronic
@@ -116,17 +116,21 @@ RUN mkdir -p /usr/src/app && chown docker:docker /usr/src/app
116
116
WORKDIR /usr/src/app
117
117
118
118
119
+
120
+
119
121
COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
120
122
COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
121
123
COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
122
124
COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
123
125
124
126
127
+
125
128
CMD [ "node" ]
126
129
127
130
128
131
129
132
130
133
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
131
134
135
+
132
136
USER docker
Original file line number Diff line number Diff line change 14
14
# |
15
15
16
16
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
18
18
19
19
# |--------------------------------------------------------------------------
20
20
# | Supercronic
@@ -193,11 +193,14 @@ RUN mkdir -p /var/www/html && chown docker:docker /var/www/html
193
193
WORKDIR /var/www/html
194
194
{{ end }}
195
195
196
+
197
+
196
198
COPY utils/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
197
199
COPY utils/docker-entrypoint-as-root.sh /usr/local/bin/docker-entrypoint-as-root.sh
198
200
COPY utils/startup_commands.js /usr/local/bin/startup_commands.js
199
201
COPY utils/generate_cron.js /usr/local/bin/generate_cron.js
200
202
203
+
201
204
{{ if eq $variant "apache" }}
202
205
COPY utils/enable_apache_mods.js /usr/local/bin/enable_apache_mods.js
203
206
COPY utils/apache-expose-envvars.sh /usr/local/bin/apache-expose-envvars.sh
@@ -230,4 +233,5 @@ CMD [ "node" ]
230
233
231
234
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
232
235
236
+
233
237
USER docker
Original file line number Diff line number Diff line change 2
2
3
3
set -e
4
4
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" " $@ " ;
You can’t perform that action at this time.
0 commit comments