play stack one by one

This commit is contained in:
2025-02-02 21:20:39 +01:00
parent 2544559b39
commit 69ea64df4c
29 changed files with 143 additions and 86 deletions
+3 -3
View File
@@ -1,6 +1,6 @@
ENV_VARS += USER_IPFS_API_HTTPHEADERS_ACA_ORIGIN USER_IPFS_LETSENCRYPT_HOST USER_IPFS_PATH USER_IPFS_SERVICE_5001_TAGS USER_IPFS_SERVICE_8080_TAGS
USER_IPFS_API_HTTPHEADERS_ACA_ORIGIN ?= [$(call patsublist,%,"https://%",$(patsubst %/,%,$(USER_IPFS_SERVICE_8080_URIS)))]
USER_IPFS_LETSENCRYPT_HOST ?= $(subst $(space),$(comma),$(call uriprefix,USER_IPFS,,$(USER_HOST)))
USER_IPFS_LETSENCRYPT_HOST ?= $(subst $(space),$(comma),$(call uri,USER_IPFS,,$(USER_HOST)))
USER_IPFS_PATH ?= $(USER_HOME)/.ipfs
USER_IPFS_SERVICE_NAME ?= ipfs
USER_IPFS_SERVICE_5001_PATH ?= api/
@@ -8,7 +8,7 @@ USER_IPFS_SERVICE_5001_TAGS ?= $(or $(USER_IPFS_SERVICE_5001_TAGS_
USER_IPFS_SERVICE_5001_TAGS_LOCALHOST ?= $(filter %.localhost/$(USER_PATH)$(USER_IPFS_SERVICE_5001_PATH)$(url_suffix),$(call tagprefix,USER_IPFS,5001))
USER_IPFS_SERVICE_5001_TAGS_PROXY_TCP ?= $(call patsublist,%,urlprefix-% proxy=tcp,$(USER_IPFS_SERVICE_PROXY_TCP))
USER_IPFS_SERVICE_5001_TAGS_URIS ?= $(strip $(if $(call servicenvs,USER_IPFS,5001,URIS),$(call urlprefix,$(USER_IPFS_SERVICE_5001_PATH),,$(call servicenvs,USER_IPFS,5001,URIS))))
USER_IPFS_SERVICE_5001_URIS ?= $(call uriprefix,USER_IPFS,5001,$(USER_URIS))
USER_IPFS_SERVICE_5001_URIS ?= $(call uri,USER_IPFS,5001,$(USER_URIS))
USER_IPFS_SERVICE_8080_OPTS ?= $(patsubst %/,%,$(if $(USER_PATH),strip=/$(USER_PATH)))
USER_IPFS_SERVICE_8080_TAGS ?= $(call tagprefix,USER_IPFS,8080)
USER_IPFS_SERVICE_8080_URIS ?= $(call uriprefix,USER_IPFS,8080,$(USER_URIS))
USER_IPFS_SERVICE_8080_URIS ?= $(call uri,USER_IPFS,8080,$(USER_URIS))
+1 -1
View File
@@ -16,4 +16,4 @@ services:
- private
restart: always
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ${DOCKER_SOCKET_LOCATION}:/var/run/docker.sock
+1 -1
View File
@@ -10,4 +10,4 @@ services:
- private
restart: always
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ${DOCKER_SOCKET_LOCATION}:/var/run/docker.sock
+1 -1
View File
@@ -3,7 +3,7 @@ DUNITER_UI_SERVICE_NAME ?= $(DUNITER_V2S_SERVICE_NAME)
DUNITER_UI_SERVICE_80_PATH ?= ui/
DUNITER_UI_SERVICE_80_STRIP ?= /ui
DUNITER_UI_SERVICE_80_TAGS ?= $(call tagprefix,DUNITER_UI,80)
DUNITER_UI_WS_URL ?= wss://$(DUNITER_V2S_SERVICE_NAME).$(firstword $(APP_URIS))$(firstword $(DUNITER_V2S_SERVICE_9944_PATH))
DUNITER_UI_WS_URL ?= wss://$(DUNITER_V2S_SERVICE_NAME).$(firstword $(APP_URI))$(firstword $(DUNITER_V2S_SERVICE_9944_PATH))
DUNITER_V2S_DUNITER_CHAIN_NAME ?= gdev
DUNITER_V2S_DUNITER_NODE_NAME ?= $(USER)-$(ENV)-$(DUNITER_V2S_DUNITER_PRUNING_PROFILE)
DUNITER_V2S_DUNITER_PUBLIC_ADDR ?= /dns/$(DUNITER_V2S_SERVICE_NAME).$(firstword $(APP_HOST))/tcp/443/wss
+1 -1
View File
@@ -18,7 +18,7 @@ services:
volumes_from:
- nginx
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
- ${DOCKER_SOCKET_LOCATION}:/var/run/docker.sock:ro
- acme:/etc/acme.sh
- certs:/etc/nginx/certs
- html:/usr/share/nginx/html
+1 -1
View File
@@ -8,4 +8,4 @@ services:
image: willfarrell/autoheal:latest
restart: always
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ${DOCKER_SOCKET_LOCATION}:/var/run/docker.sock
+1 -1
View File
@@ -42,7 +42,7 @@ services:
restart: always
volumes:
- consul:/consul/data:delegated
- /var/run/docker.sock:/var/run/docker.sock
- ${DOCKER_SOCKET_LOCATION}:/var/run/docker.sock
volumes:
consul:
+1 -1
View File
@@ -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_SERVICE_8080_URIS ?= $(call uri,ipfs *.ipns)
HOST_IPFS_UFW_UPDATE ?= 4001/tcp 4001/udp 8080
+1 -1
View File
@@ -38,7 +38,7 @@ services:
- 443
restart: unless-stopped
volumes:
- /var/run/docker.sock:/tmp/docker.sock:ro
- ${DOCKER_SOCKET_LOCATION}:/tmp/docker.sock:ro
- certs:/etc/nginx/certs
- html:/usr/share/nginx/html
- htpasswd:/etc/nginx/htpasswd
+1 -1
View File
@@ -16,7 +16,7 @@ services:
- 9000
restart: always
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ${DOCKER_SOCKET_LOCATION}:/var/run/docker.sock
- portainer:/data
volumes:
+1 -1
View File
@@ -25,4 +25,4 @@ services:
network_mode: host
restart: always
volumes:
- /var/run/docker.sock:/tmp/docker.sock
- ${DOCKER_SOCKET_LOCATION}:/tmp/docker.sock
+1 -1
View File
@@ -6,7 +6,7 @@ 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 urlprefix,,,$(IPFS_SERVICE_8080_URIS))
IPFS_SERVICE_8080_URIS ?= $(call uriprefix,ipfs *.ipns)
IPFS_SERVICE_8080_URIS ?= $(call uri,ipfs *.ipns)
IPFS_VERSION ?= 0.16.0
.PHONY: bootstrap-stack-ipfs
+2
View File
@@ -1,4 +1,6 @@
networks:
default:
name: ${DOCKER_NETWORK_DEFAULT:-_default}
private:
external: true
name: ${DOCKER_NETWORK_PRIVATE:-docker}
+1 -1
View File
@@ -28,7 +28,7 @@ services:
- 443
restart: unless-stopped
volumes:
- /var/run/docker.sock:/tmp/docker.sock:ro
- ${DOCKER_SOCKET_LOCATION}:/tmp/docker.sock:ro
- certs:/etc/nginx/certs
- html:/usr/share/nginx/html
- log:/var/log/nginx
+1 -1
View File
@@ -15,7 +15,7 @@ services:
- 9000
restart: always
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ${DOCKER_SOCKET_LOCATION}:/var/run/docker.sock
- portainer:/data
volumes:
+1 -1
View File
@@ -1,5 +1,5 @@
ENV_VARS += PROMETHEUS_BLACKBOX_PRIMARY_TARGETS PROMETHEUS_BLACKBOX_SECONDARY_TARGETS PROMETHEUS_SERVICE_9090_TAGS
PROMETHEUS_BLACKBOX_PRIMARY_TARGETS ?= $(patsubst %,https://%,$(DOMAIN))
PROMETHEUS_BLACKBOX_SECONDARY_TARGETS ?= $(patsubst %,https://%,$(APP_URIS))
PROMETHEUS_BLACKBOX_SECONDARY_TARGETS ?= $(patsubst %,https://%,$(APP_URI))
PROMETHEUS_SERVICE_9090_NAME ?= prometheus
PROMETHEUS_SERVICE_9090_TAGS ?= $(call tagprefix,prometheus,9090)
+1 -1
View File
@@ -20,4 +20,4 @@ services:
- 514
restart: always
volumes:
- /var/run/docker.sock:/tmp/docker.sock
- ${DOCKER_SOCKET_LOCATION}:/tmp/docker.sock
+1 -1
View File
@@ -33,7 +33,7 @@ services:
volumes:
- sources:/Sources:cached
- user:/tmp/ssh-agent:ro
- /var/run/docker.sock:/var/run/docker.sock
- ${DOCKER_SOCKET_LOCATION}:/var/run/docker.sock
volumes:
sources: