Use compose 3.7 init instead of tini

This commit is contained in:
sn0w 2018-12-24 23:21:16 +01:00
parent 5c9107b67f
commit bdf83f7227
2 changed files with 3 additions and 9 deletions

View File

@ -10,14 +10,7 @@ ENV LANG=C.UTF-8
# Register pseudo-entrypoint
ADD ./entrypoint.sh /
RUN chmod a+x /entrypoint.sh
CMD ["/entrypoint.sh"]
# Set "real" entrypoint to an init system.
# TODO: Replace with --init when docker 18.06 is GA
ENV TINI_VERSION v0.18.0
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
RUN chmod +x /tini
ENTRYPOINT ["/tini", "--"]
ENTRYPOINT ["/entrypoint.sh"]
# Get build dependencies
RUN \

View File

@ -7,7 +7,7 @@ define(<env_inline>, <${upcase($1):?upcase($1)}>)
define(<env_inline_fb>, <${upcase($1):-$2}>)
{
"version": "3",
"version": "3.7",
ifdef(<__DOCKER_NETWORK>, <
"networks": {
@ -91,6 +91,7 @@ define(<env_inline_fb>, <${upcase($1):-$2}>)
"env_fb(<pleroma_uploads_path>, </uploads>)"
]
},
"init": true,
"restart": "unless-stopped",
"links": [
ifelse(__SCRIPT_DEPLOY_POSTGRES, true, <"db">)