Skip to content

Commit

Permalink
Use sponge due empty supervisor.conf and nginx.conf
Browse files Browse the repository at this point in the history
  • Loading branch information
thuandt committed Mar 10, 2018
1 parent c7c3ee1 commit 7ec8619
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .hadolint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ignored:
- DL3008
- DL3015
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ RUN groupadd "${APP_GRP}" \
&& apt-get -qq -y update \
&& apt-get install -qq -o Dpkg::Options::="--force-confold" \
-y --no-install-recommends \
sudo supervisor gettext-base locales tzdata lsb-release \
jq curl vim-nox openssh-client \
supervisor curl jq vim-nox openssh-client \
moreutils gettext-base locales tzdata lsb-release \
&& curl -sSL http://nginx.org/keys/nginx_signing.key | apt-key add - \
&& echo "deb http://nginx.org/packages/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ $(lsb_release -cs) nginx" > /etc/apt/sources.list.d/nginx.list \
&& apt-get -qq -y update \
Expand Down
6 changes: 3 additions & 3 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

set -euxo pipefail

# shellcheck disable=SC2094,SC2016
envsubst '${APP_USER} ${NGINX_WORKER}' < /etc/nginx/nginx.conf > /etc/nginx/nginx.conf
# shellcheck disable=SC2016
envsubst '${APP_USER} ${NGINX_WORKER}' < /etc/nginx/nginx.conf | sponge /etc/nginx/nginx.conf

/usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf
exec /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf

0 comments on commit 7ec8619

Please sign in to comment.