mirror
/
pleroma-docker
mirror of https://memleak.eu/sn0w/pleroma-docker.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adopt --init for server container 

Fixes #5
This commit is contained in:
Lukas Breuer 2018-10-24 14:06:10 +02:00
parent 0849b0ecad
commit a196fd3613
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile
View File

@ -10,14 +10,7 @@ ENV LANG=C.UTF-8
# Register pseudo-entrypoint # Register pseudo-entrypoint
ADD ./entrypoint.sh / ADD ./entrypoint.sh /
RUN chmod a+x /entrypoint.sh RUN chmod a+x /entrypoint.sh
CMD ["/entrypoint.sh"] ENTRYPOINT ["/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", "--"]
# Get build dependencies # Get build dependencies
RUN \ RUN \

3
docker-compose.m4
View File

@ -7,7 +7,7 @@ define(<env_inline>, <${upcase($1):?upcase($1)}>)
define(<env_inline_fb>, <${upcase($1):-$2}>) define(<env_inline_fb>, <${upcase($1):-$2}>)
{ {
"version": "3", "version": "3.7",
ifdef(<__DOCKER_NETWORK>, < ifdef(<__DOCKER_NETWORK>, <
"networks": { "networks": {
@ -82,6 +82,7 @@ define(<env_inline_fb>, <${upcase($1):-$2}>)
>) >)
"server": { "server": {
"init": true,
"build": { "build": {
"context": ".", "context": ".",
"args": [ "args": [