armv7

docker/compose/Dockerfile

@@ -10,7 +10,7 @@ ARG DOCKER_SYSTEM=Linux
 RUN apk update \
  && apk add --no-cache ca-certificates \
  && OS="$(echo ${DOCKER_SYSTEM} |awk '{print tolower($0)}')"; \
-    ARCH="$(echo ${DOCKER_MACHINE})"; \
+    ARCH="$(echo ${DOCKER_MACHINE} |awk '/armv7l/ {print "armv7"}')"; \
     wget -qO /usr/bin/docker-compose ${COMPOSE_REMOTE}/releases/download/v${COMPOSE_VERSION}/docker-compose-${OS}-${ARCH} \
  && chmod +x /usr/bin/docker-compose
 

docker/fabio/Dockerfile

@@ -10,7 +10,7 @@ ARG FABIO_VERSION=1.6.0
 RUN apk update \
  && apk add --no-cache ca-certificates \
  && OS="$(echo ${DOCKER_SYSTEM} |awk '{print tolower($0)}')"; \
-    ARCH="$(echo ${DOCKER_MACHINE} |awk '/x86_64/ {print "amd64"}; /aarch64/ {print "arm64"}')"; \
+    ARCH="$(echo ${DOCKER_MACHINE} |awk '/x86_64/ {print "amd64"}; /aarch64/ {print "arm64"}; /armv7/ {print "arm"};')"; \
     wget -qO /usr/bin/fabio ${FABIO_REMOTE}/releases/download/v${FABIO_VERSION}/fabio-${FABIO_VERSION}-${OS}_${ARCH} \
  && chmod +x /usr/bin/fabio
 

make/apps/def.docker.mk

@@ -136,7 +136,7 @@ define docker-stack-update
 	$(eval name             := $(firstword $(subst :, ,$(stack))))
 	$(eval version          := $(or $(2),$(if $(findstring :,$(stack)),$(lastword $(subst :, ,$(stack))),latest)))
 	$(eval path             := $(patsubst %/,%,$(or $(3),$(if $(findstring /,$(1)),$(if $(wildcard stack/$(1) stack/$(1).yml),stack/$(if $(findstring .yml,$(1)),$(dir $(1)),$(if $(wildcard stack/$(1).yml),$(dir $(1)),$(1))),$(dir $(1)))),stack/$(name))))
-	$(eval COMPOSE_FILE     += $(wildcard $(path)/$(name).yml $(path)/$(name).$(ENV).yml $(path)/$(name).$(ENV).$(version).yml $(path)/$(name).$(version).yml))
+	$(eval COMPOSE_FILE     += $(wildcard $(foreach file,$(name) $(name).$(ENV) $(name).$(ENV).$(version) $(name).$(version),$(path)/$(file).yml)))
 	$(eval COMPOSE_FILE     := $(strip $(COMPOSE_FILE)))
 	$(if $(wildcard $(path)/.env.dist),$(call .env,,$(path)/.env.dist,$(wildcard $(CONFIG)/$(ENV)/$(APP)/.env $(path)/.env.$(ENV) .env)))
 endef

stack/User/ipfs.yml

@@ -88,10 +88,10 @@ services:
         soft: 65536
         hard: 65536
     volumes:
-    - host:/home:delegated
+    - home:/home:delegated
 
 volumes:
-  host:
+  home:
     external: true
     name: ${HOST_DOCKER_VOLUME}_home
 

stack/host/ipfs.home.yml

@@ -0,0 +1,10 @@
+version: '3.6'
+
+services:
+  ipfs:
+    volumes:
+    - home:/home:delegated
+
+volumes:
+  home:
+

stack/host/ipfs.yml

@@ -31,11 +31,11 @@ services:
     - IPFS_BOOTSTRAP=${HOST_IPFS_BOOTSTRAP:-}
     - IPFS_DATASTORE_GCPERIOD=${HOST_IPFS_DATASTORE_GCPERIOD:-}
     - IPFS_DISK_USAGE_PERCENT=${HOST_IPFS_DISK_USAGE_PERCENT:-}
-    - IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT=${HOST_IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT:-}
+    - IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT=${HOST_IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT:-true}
     - IPFS_EXPERIMENTAL_FILESTOREENABLED=${HOST_IPFS_EXPERIMENTAL_FILESTOREENABLED:-}
     - IPFS_EXPERIMENTAL_GRAPHSYNCENABLED=${HOST_IPFS_EXPERIMENTAL_GRAPHSYNCENABLED:-}
-    - IPFS_EXPERIMENTAL_LIBP2PSTREAMMOUNTING=${HOST_IPFS_EXPERIMENTAL_LIBP2PSTREAMMOUNTING:-}
-    - IPFS_EXPERIMENTAL_P2PHTTPPROXY=${HOST_IPFS_EXPERIMENTAL_P2PHTTPPROXY:-}
+    - IPFS_EXPERIMENTAL_LIBP2PSTREAMMOUNTING=${HOST_IPFS_EXPERIMENTAL_LIBP2PSTREAMMOUNTING:-true}
+    - IPFS_EXPERIMENTAL_P2PHTTPPROXY=${HOST_IPFS_EXPERIMENTAL_P2PHTTPPROXY:-true}
     - IPFS_EXPERIMENTAL_STRATEGICPROVIDING=${HOST_IPFS_EXPERIMENTAL_STRATEGICPROVIDING:-}
     - IPFS_EXPERIMENTAL_URLSTOREENABLED=${HOST_IPFS_EXPERIMENTAL_URLSTOREENABLED:-}
     - IPFS_IDENTITY_PEERID=${HOST_IPFS_IDENTITY_PEERID:-}
@@ -45,12 +45,13 @@ services:
     - IPFS_IPNS_USEPUBSUB=${HOST_IPFS_IPNS_USEPUBSUB:-true}
     - IPFS_LOGGING=${HOST_IPFS_LOGGING:-error}
     - IPFS_NETWORK=${HOST_IPFS_NETWORK:-public}
+    - IPFS_PATH=${HOST_IPFS_PATH:-/data/ipfs}
     - IPFS_PROFILE=${HOST_IPFS_PROFILE:-${IPFS_PROFILE}}
     - IPFS_PUBSUB_ENABLE=${HOST_IPFS_PUBSUB_ENABLE:-true}
     - IPFS_PUBSUB_ROUTER=${HOST_IPFS_PUBSUB_ROUTER:-gossipsub}
     - IPFS_ROUTING_TYPE=${HOST_IPFS_ROUTING_TYPE:-dht}
     - IPFS_REPROVIDER_INTERVAL=${HOST_IPFS_REPROVIDER_INTERVAL:-}
-    - IPFS_REPROVIDER_STRATEGY=${HOST_IPFS_REPROVIDER_STRATEGY:-}
+    - IPFS_REPROVIDER_STRATEGY=${HOST_IPFS_REPROVIDER_STRATEGY:-roots}
     - IPFS_SWARM_CONNMGR_HIGHWATER=${HOST_IPFS_SWARM_CONNMGR_HIGHWATER:-}
     - IPFS_SWARM_CONNMGR_LOWWATER=${HOST_IPFS_SWARM_CONNMGR_LOWWATER:-}
     - IPFS_SWARM_CONNMGR_TYPE=${HOST_IPFS_SWARM_CONNMGR_TYPE:-}
@@ -85,9 +86,11 @@ services:
         soft: 65536
         hard: 65536
     volumes:
+    - home:/home:delegated
     - ipfs:/data/ipfs:delegated
 
 volumes:
+  home:
   ipfs:
 
 networks:

stack/host/volumes.home.local.yml

@@ -0,0 +1,10 @@
+version: '3.6'
+
+volumes:
+  home:
+    driver: local
+    driver_opts:
+      device: /home
+      o: bind
+      type: none
+