ipfs network mode host
This commit is contained in:
parent
4cc840d392
commit
22795450d7
|
@ -39,14 +39,7 @@ endif
|
||||||
|
|
||||||
# target setup-ufw: Install ufw-docker
|
# target setup-ufw: Install ufw-docker
|
||||||
.PHONY: setup-ufw
|
.PHONY: setup-ufw
|
||||||
setup-ufw: COMPOSE_PROJECT_NAME := $(HOST_COMPOSE_PROJECT_NAME)
|
setup-ufw: ufw-install ufw-bootstrap ufw-build ufw-up
|
||||||
setup-ufw: DOCKER_RUN_NETWORK :=
|
|
||||||
setup-ufw: DOCKER_RUN_OPTIONS := --rm -d --cap-add NET_ADMIN -v /etc/ufw:/etc/ufw $(if wildcard /etc/default/ufw,-v /etc/default/ufw:/etc/default/ufw) --network host
|
|
||||||
setup-ufw:
|
|
||||||
ifeq ($(SETUP_UFW),true)
|
ifeq ($(SETUP_UFW),true)
|
||||||
$(call app-install,$(SETUP_UFW_REPOSITORY))
|
|
||||||
$(call app-bootstrap,$(lastword $(subst /, ,$(SETUP_UFW_REPOSITORY))))
|
|
||||||
$(call app-build)
|
|
||||||
$(call app-up)
|
|
||||||
$(call ufw-docker,install)
|
$(call ufw-docker,install)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -3,6 +3,14 @@
|
||||||
ufw:
|
ufw:
|
||||||
$(call ufw,$(ARGS))
|
$(call ufw,$(ARGS))
|
||||||
|
|
||||||
|
# target ufw-bootstrap: Eval ufw-docker app variables
|
||||||
|
ufw-bootstrap:
|
||||||
|
$(call app-bootstrap,$(lastword $(subst /, ,$(SETUP_UFW_REPOSITORY))))
|
||||||
|
|
||||||
|
# target ufw-build: Build ufw-docker docker
|
||||||
|
ufw-build:
|
||||||
|
$(call app-build)
|
||||||
|
|
||||||
# target ufw-delete: Fire ufw-update UFW_DELETE=true
|
# target ufw-delete: Fire ufw-update UFW_DELETE=true
|
||||||
.PHONY: ufw-delete
|
.PHONY: ufw-delete
|
||||||
ufw-delete: UFW_DELETE := true
|
ufw-delete: UFW_DELETE := true
|
||||||
|
@ -13,7 +21,18 @@ ufw-delete: ufw-update
|
||||||
ufw-docker:
|
ufw-docker:
|
||||||
$(call ufw-docker,$(ARGS))
|
$(call ufw-docker,$(ARGS))
|
||||||
|
|
||||||
# target ufw-docker: Call ufw and ufw-docker foreach service UFW_UPDATE
|
# target ufw-install: Download ufw-docker application
|
||||||
|
ufw-install:
|
||||||
|
$(call app-install,$(SETUP_UFW_REPOSITORY))
|
||||||
|
|
||||||
|
# target ufw-up: Start ufw-docker docker
|
||||||
|
ufw-up: COMPOSE_PROJECT_NAME := $(HOST_COMPOSE_PROJECT_NAME)
|
||||||
|
ufw-up: DOCKER_RUN_NETWORK :=
|
||||||
|
ufw-up: DOCKER_RUN_OPTIONS := --rm -d --cap-add NET_ADMIN -v /etc/ufw:/etc/ufw $(if wildcard /etc/default/ufw,-v /etc/default/ufw:/etc/default/ufw) --network host
|
||||||
|
ufw-up:
|
||||||
|
$(call app-up)
|
||||||
|
|
||||||
|
# target ufw-update: Call ufw and ufw-docker foreach service UFW_UPDATE
|
||||||
.PHONY: ufw-update
|
.PHONY: ufw-update
|
||||||
ufw-update: debug-UFW_UPDATE
|
ufw-update: debug-UFW_UPDATE
|
||||||
$(eval name := $(COMPOSE_PROJECT_NAME))
|
$(eval name := $(COMPOSE_PROJECT_NAME))
|
||||||
|
@ -28,8 +47,9 @@ ufw-update: debug-UFW_UPDATE
|
||||||
) \
|
) \
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# target ufw-%: Call ufw target for specific stack
|
||||||
## ex: ufw-host-update will update ufw rules for stack host
|
## ex: ufw-host-update will update ufw rules for stack host
|
||||||
.PHONY: stack-%
|
.PHONY: ufw-%
|
||||||
ufw-%:
|
ufw-%:
|
||||||
$(eval stack := $(subst -$(lastword $(subst -, ,$*)),,$*))
|
$(eval stack := $(subst -$(lastword $(subst -, ,$*)),,$*))
|
||||||
$(eval command := $(lastword $(subst -, ,$*)))
|
$(eval command := $(lastword $(subst -, ,$*)))
|
||||||
|
|
|
@ -6,12 +6,7 @@ services:
|
||||||
- DOCUMENT_ROOT=/var/www
|
- DOCUMENT_ROOT=/var/www
|
||||||
volumes:
|
volumes:
|
||||||
- www:/var/www
|
- www:/var/www
|
||||||
nginx:
|
|
||||||
volumes:
|
|
||||||
- www:/var/www
|
|
||||||
php:
|
|
||||||
volumes:
|
|
||||||
- www:/var/www
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
www:
|
www:
|
||||||
|
|
|
@ -6,5 +6,5 @@ HOST_IPFS_SERVICE_5001_PATH ?= api/
|
||||||
HOST_IPFS_SERVICE_5001_TAGS ?= $(call tagprefix,HOST_IPFS,5001)
|
HOST_IPFS_SERVICE_5001_TAGS ?= $(call tagprefix,HOST_IPFS,5001)
|
||||||
HOST_IPFS_SERVICE_8080_ENVS ?= host
|
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_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 uriprefix,ipfs *.ipns)
|
||||||
HOST_IPFS_UFW_DOCKER ?= 4001/tcp 4001/udp 8080
|
HOST_IPFS_UFW_UPDATE ?= 4001/tcp 4001/udp 8080
|
||||||
|
|
|
@ -61,6 +61,8 @@ services:
|
||||||
- IPFS_SWARM_RELAYCLIENT_ENABLED=${HOST_IPFS_SWARM_RELAYCLIENT_ENABLED:-}
|
- IPFS_SWARM_RELAYCLIENT_ENABLED=${HOST_IPFS_SWARM_RELAYCLIENT_ENABLED:-}
|
||||||
- IPFS_SWARM_RELAYSERVICE_ENABLED=${HOST_IPFS_SWARM_RELAYSERVICE_ENABLED:-}
|
- IPFS_SWARM_RELAYSERVICE_ENABLED=${HOST_IPFS_SWARM_RELAYSERVICE_ENABLED:-}
|
||||||
- IPFS_SWARM_TRANSPORTS_NETWORK_RELAY=${HOST_IPFS_SWARM_TRANSPORTS_NETWORK_RELAY:-}
|
- IPFS_SWARM_TRANSPORTS_NETWORK_RELAY=${HOST_IPFS_SWARM_TRANSPORTS_NETWORK_RELAY:-}
|
||||||
|
healthcheck:
|
||||||
|
timeout: 5s
|
||||||
image: ${HOST_DOCKER_REPOSITORY}/ipfs:${DOCKER_IMAGE_TAG}
|
image: ${HOST_DOCKER_REPOSITORY}/ipfs:${DOCKER_IMAGE_TAG}
|
||||||
labels:
|
labels:
|
||||||
- SERVICE_4001_CHECK_TCP=true
|
- SERVICE_4001_CHECK_TCP=true
|
||||||
|
@ -73,27 +75,15 @@ services:
|
||||||
- SERVICE_8080_NAME=${HOST_COMPOSE_SERVICE_NAME}-ipfs-8080
|
- SERVICE_8080_NAME=${HOST_COMPOSE_SERVICE_NAME}-ipfs-8080
|
||||||
- SERVICE_8080_TAGS=${HOST_IPFS_SERVICE_8080_TAGS:-}
|
- SERVICE_8080_TAGS=${HOST_IPFS_SERVICE_8080_TAGS:-}
|
||||||
- SERVICE_8081_IGNORE=true
|
- SERVICE_8081_IGNORE=true
|
||||||
networks:
|
network_mode: host
|
||||||
- public
|
|
||||||
ports:
|
|
||||||
- 4001:4001/tcp
|
|
||||||
- 4001:4001/udp
|
|
||||||
- 5001:5001/tcp
|
|
||||||
- 8080:8080/tcp
|
|
||||||
restart: always
|
restart: always
|
||||||
ulimits:
|
ulimits:
|
||||||
nofile:
|
nofile:
|
||||||
soft: 65536
|
soft: 65536
|
||||||
hard: 65536
|
hard: 65536
|
||||||
volumes:
|
volumes:
|
||||||
- home:/home:delegated
|
|
||||||
- ipfs:/data/ipfs:delegated
|
- ipfs:/data/ipfs:delegated
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
home:
|
|
||||||
ipfs:
|
ipfs:
|
||||||
|
|
||||||
networks:
|
|
||||||
public:
|
|
||||||
external: true
|
|
||||||
name: ${DOCKER_NETWORK_PUBLIC}
|
|
||||||
|
|
|
@ -6,9 +6,7 @@ services:
|
||||||
- DEFAULT=default_dns
|
- DEFAULT=default_dns
|
||||||
volumes:
|
volumes:
|
||||||
- dns:/dns
|
- dns:/dns
|
||||||
php:
|
|
||||||
volumes:
|
|
||||||
- dns:/dns
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
dns:
|
dns:
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
version: '3.6'
|
||||||
|
|
||||||
|
services:
|
||||||
|
nginx:
|
||||||
|
volumes:
|
||||||
|
- www:/var/www
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
www:
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
version: '3.6'
|
||||||
|
|
||||||
|
services:
|
||||||
|
php:
|
||||||
|
volumes:
|
||||||
|
- dns:/dns
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
dns:
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
version: '3.6'
|
||||||
|
|
||||||
|
services:
|
||||||
|
php:
|
||||||
|
volumes:
|
||||||
|
- www:/var/www
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
www:
|
||||||
|
|
|
@ -13,6 +13,7 @@ services:
|
||||||
image: php:fpm-alpine
|
image: php:fpm-alpine
|
||||||
networks:
|
networks:
|
||||||
- public
|
- public
|
||||||
|
restart: always
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -5,8 +5,8 @@ IPFS_SERVICE_NAME ?= ipfs
|
||||||
IPFS_SERVICE_5001_PATH ?= api/
|
IPFS_SERVICE_5001_PATH ?= api/
|
||||||
IPFS_SERVICE_5001_TAGS ?= $(call tagprefix,ipfs,5001)
|
IPFS_SERVICE_5001_TAGS ?= $(call tagprefix,ipfs,5001)
|
||||||
IPFS_SERVICE_8080_CHECK_HTTP ?= /ipfs/QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn
|
IPFS_SERVICE_8080_CHECK_HTTP ?= /ipfs/QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn
|
||||||
IPFS_SERVICE_8080_TAGS ?= $(call tagprefix,ipfs,8080)
|
IPFS_SERVICE_8080_TAGS ?= $(call urlprefix,,,$(IPFS_SERVICE_8080_URIS))
|
||||||
IPFS_SERVICE_8080_URIS ?= $(patsubst %,ipfs.%,$(APP_URIS)) $(patsubst %,*.ipfs.%,$(APP_URIS)) $(patsubst %,ipns.%,$(APP_URIS)) $(patsubst %,*.ipns.%,$(APP_URIS))
|
IPFS_SERVICE_8080_URIS ?= $(call uriprefix,ipfs *.ipns)
|
||||||
IPFS_VERSION ?= 0.16.0
|
IPFS_VERSION ?= 0.16.0
|
||||||
|
|
||||||
.PHONY: bootstrap-stack-ipfs
|
.PHONY: bootstrap-stack-ipfs
|
||||||
|
|
|
@ -2,4 +2,4 @@ version: '3.6'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:latest
|
image: postgres:alpine
|
||||||
|
|
|
@ -4,6 +4,7 @@ services:
|
||||||
postgres:
|
postgres:
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_DB=${POSTGRES_DB:-postgres}
|
- POSTGRES_DB=${POSTGRES_DB:-postgres}
|
||||||
|
- POSTGRES_HOST_AUTH_METHOD=${POSTGRES_HOST_AUTH_METHOD:-trust}
|
||||||
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-postgres}
|
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-postgres}
|
||||||
- POSTGRES_USER=${POSTGRES_USER:-postgres}
|
- POSTGRES_USER=${POSTGRES_USER:-postgres}
|
||||||
labels:
|
labels:
|
||||||
|
|
Loading…
Reference in New Issue