ipfs network mode host

stack/host/apache/php5.www.yml

@@ -6,12 +6,7 @@ services:
     - DOCUMENT_ROOT=/var/www
     volumes:
     - www:/var/www
-  nginx:
-    volumes:
-    - www:/var/www
-  php:
-    volumes:
-    - www:/var/www
 
 volumes:
   www:
+

stack/host/ipfs.mk

@@ -6,5 +6,5 @@ HOST_IPFS_SERVICE_5001_PATH               ?= api/
 HOST_IPFS_SERVICE_5001_TAGS               ?= $(call tagprefix,HOST_IPFS,5001)
 HOST_IPFS_SERVICE_8080_ENVS               ?= host
 HOST_IPFS_SERVICE_8080_TAGS               ?= $(call urlprefix,,,$(HOST_IPFS_SERVICE_8080_URIS) $(call servicenvs,HOST_IPFS,8080,URIS))
-HOST_IPFS_SERVICE_8080_URIS               ?= $(call uriprefix,*ipfs *ipns)
-HOST_IPFS_UFW_DOCKER                      ?= 4001/tcp 4001/udp 8080
+HOST_IPFS_SERVICE_8080_URIS               ?= $(call uriprefix,ipfs *.ipns)
+HOST_IPFS_UFW_UPDATE                      ?= 4001/tcp 4001/udp 8080

stack/host/ipfs.yml

@@ -61,6 +61,8 @@ services:
     - IPFS_SWARM_RELAYCLIENT_ENABLED=${HOST_IPFS_SWARM_RELAYCLIENT_ENABLED:-}
     - IPFS_SWARM_RELAYSERVICE_ENABLED=${HOST_IPFS_SWARM_RELAYSERVICE_ENABLED:-}
     - IPFS_SWARM_TRANSPORTS_NETWORK_RELAY=${HOST_IPFS_SWARM_TRANSPORTS_NETWORK_RELAY:-}
+    healthcheck:
+      timeout: 5s
     image: ${HOST_DOCKER_REPOSITORY}/ipfs:${DOCKER_IMAGE_TAG}
     labels:
     - SERVICE_4001_CHECK_TCP=true
@@ -73,27 +75,15 @@ services:
     - SERVICE_8080_NAME=${HOST_COMPOSE_SERVICE_NAME}-ipfs-8080
     - SERVICE_8080_TAGS=${HOST_IPFS_SERVICE_8080_TAGS:-}
     - SERVICE_8081_IGNORE=true
-    networks:
-    - public
-    ports:
-    - 4001:4001/tcp
-    - 4001:4001/udp
-    - 5001:5001/tcp
-    - 8080:8080/tcp
+    network_mode: host
     restart: always
     ulimits:
       nofile:
         soft: 65536
         hard: 65536
     volumes:
-    - home:/home:delegated
     - ipfs:/data/ipfs:delegated
 
 volumes:
-  home:
   ipfs:
 
-networks:
-  public:
-    external: true
-    name: ${DOCKER_NETWORK_PUBLIC}

stack/host/nginx.dns.yml

@@ -6,9 +6,7 @@ services:
     - DEFAULT=default_dns
     volumes:
     - dns:/dns
-  php:
-    volumes:
-    - dns:/dns
 
 volumes:
   dns:
+

stack/host/nginx.www.yml

@@ -0,0 +1,10 @@
+version: '3.6'
+
+services:
+  nginx:
+    volumes:
+    - www:/var/www
+
+volumes:
+  www:
+

stack/host/php.dns.yml

@@ -0,0 +1,10 @@
+version: '3.6'
+
+services:
+  php:
+    volumes:
+    - dns:/dns
+
+volumes:
+  dns:
+

stack/host/php.www.yml

@@ -0,0 +1,10 @@
+version: '3.6'
+
+services:
+  php:
+    volumes:
+    - www:/var/www
+
+volumes:
+  www:
+

stack/host/php.yml

@@ -13,6 +13,7 @@ services:
     image: php:fpm-alpine
     networks:
     - public
+    restart: always
 
 networks:
   public:

stack/ipfs/ipfs.mk

@@ -5,8 +5,8 @@ IPFS_SERVICE_NAME                         ?= ipfs
 IPFS_SERVICE_5001_PATH                    ?= api/
 IPFS_SERVICE_5001_TAGS                    ?= $(call tagprefix,ipfs,5001)
 IPFS_SERVICE_8080_CHECK_HTTP              ?= /ipfs/QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn
-IPFS_SERVICE_8080_TAGS                    ?= $(call tagprefix,ipfs,8080)
-IPFS_SERVICE_8080_URIS                    ?= $(patsubst %,ipfs.%,$(APP_URIS)) $(patsubst %,*.ipfs.%,$(APP_URIS)) $(patsubst %,ipns.%,$(APP_URIS)) $(patsubst %,*.ipns.%,$(APP_URIS))
+IPFS_SERVICE_8080_TAGS                    ?= $(call urlprefix,,,$(IPFS_SERVICE_8080_URIS))
+IPFS_SERVICE_8080_URIS                    ?= $(call uriprefix,ipfs *.ipns)
 IPFS_VERSION                              ?= 0.16.0
 
 .PHONY: bootstrap-stack-ipfs

stack/postgres/postgres.latest.yml

@@ -2,4 +2,4 @@ version: '3.6'
 
 services:
   postgres:
-    image: postgres:latest
+    image: postgres:alpine

stack/postgres/postgres.yml

@@ -4,6 +4,7 @@ services:
   postgres:
     environment:
     - POSTGRES_DB=${POSTGRES_DB:-postgres}
+    - POSTGRES_HOST_AUTH_METHOD=${POSTGRES_HOST_AUTH_METHOD:-trust}
     - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-postgres}
     - POSTGRES_USER=${POSTGRES_USER:-postgres}
     labels: