aya/myos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipfs v0.15.0

Browse Source
This commit is contained in:
Yann Autissier
2022-09-10 18:31:23 +02:00
parent f212978388
commit b665296f2c
20 changed files with 114 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stack/User.mk
+1
View File
@@ -1,3 +1,4 @@
CMDS += user-exec user-exec:% user-exec@% user-run user-run:% user-run@%
User ?= User/User
# target bootstrap-stack-User: Fire docker-network-create
stack/User/User.yml
+4 -4
View File
@@ -11,10 +11,10 @@ services:
- IPFS_VERSION=${IPFS_VERSION}
- UID=${UID}
- USER=${USER}
- SSH_BASTION_HOSTNAME=${SSH_BASTION_HOSTNAME}
- SSH_BASTION_USERNAME=${SSH_BASTION_USERNAME}
- SSH_PUBLIC_HOSTS=${SSH_PUBLIC_HOSTS}
- SSH_PRIVATE_IP_RANGE=${SSH_PRIVATE_IP_RANGE}
- SSH_BASTION_HOSTNAME=${SSH_BASTION_HOSTNAME:-}
- SSH_BASTION_USERNAME=${SSH_BASTION_USERNAME:-}
- SSH_PUBLIC_HOSTS=${SSH_PUBLIC_HOSTS:-}
- SSH_PRIVATE_IP_RANGE=${SSH_PRIVATE_IP_RANGE:-}
context: ../..
dockerfile: docker/myos/Dockerfile
container_name: ${USER_DOCKER_NAME}
stack/ipfs.mk
+2 -2
View File
@@ -1,6 +1,6 @@
ENV_VARS += IPFS_PROFILE IPFS_VERSION
ENV_VARS += IPFS_DAEMON_ARGS IPFS_PROFILE IPFS_VERSION
IPFS_PROFILE ?= $(if $(filter-out amd64 x86_64,$(PROCESSOR_ARCHITECTURE)),lowpower,server)
IPFS_VERSION ?= 0.14.0
IPFS_VERSION ?= 0.15.0
.PHONY: bootstrap-stack-ipfs
bootstrap-stack-ipfs: ~/.ipfs
stack/ipfs/.env.dist
+1
View File
@@ -1,5 +1,6 @@
IPFS_ADDRESSES_API_DOMAIN=${DOCKER_NETWORK_PRIVATE}
IPFS_ADDRESSES_GATEWAY_INET4=0.0.0.0
IPFS_DAEMON_ARGS=--enable-gc --migrate
IPFS_IPNS_USEPUBSUB=true
IPFS_LOGGING=error
IPFS_PUBSUB_ENABLE=true
stack/ipfs/ipfs.yml
+10 -1
View File
@@ -9,7 +9,7 @@ services:
- UID=${UID}
context: ../..
dockerfile: docker/ipfs/Dockerfile
command: daemon --agent-version-suffix=${COMPOSE_PROJECT_NAME} --enable-gc --migrate
command: daemon --agent-version-suffix=${COMPOSE_PROJECT_NAME} ${IPFS_DAEMON_ARGS}
cpus: 0.5
environment:
- IPFS_ADDRESSES_API=${IPFS_ADDRESSES_API:-}
@@ -20,6 +20,7 @@ services:
- IPFS_ADDRESSES_GATEWAY_DOMAIN=${IPFS_ADDRESSES_GATEWAY_DOMAIN:-}
- IPFS_ADDRESSES_GATEWAY_INET4=${IPFS_ADDRESSES_GATEWAY_INET4:-}
- IPFS_ADDRESSES_GATEWAY_PORT=${IPFS_ADDRESSES_GATEWAY_PORT:-}
- IPFS_ADDRESSES_NOANNOUNCE=${IPFS_ADDRESSES_NOANNOUNCE:-}
- IPFS_API_HTTPHEADERS=${IPFS_API_HTTPHEADERS:-}
- IPFS_API_HTTPHEADERS_ACA_CREDENTIALS=${IPFS_API_HTTPHEADERS_ACA_CREDENTIALS:-}
- IPFS_API_HTTPHEADERS_ACA_HEADERS=${IPFS_API_HTTPHEADERS_ACA_HEADERS:-}
@@ -43,8 +44,16 @@ services:
- IPFS_PUBSUB_ENABLE=${IPFS_PUBSUB_ENABLE:-}
- IPFS_PUBSUB_ROUTER=${IPFS_PUBSUB_ROUTER:-}
- IPFS_ROUTING_TYPE=${IPFS_ROUTING_TYPE:-}
- IPFS_REPROVIDER_INTERVAL=${IPFS_REPROVIDER_INTERVAL:-}
- IPFS_REPROVIDER_STRATEGY=${IPFS_REPROVIDER_STRATEGY:-}
- IPFS_SWARM_CONNMGR_HIGHWATER=${IPFS_SWARM_CONNMGR_HIGHWATER:-}
- IPFS_SWARM_CONNMGR_LOWWATER=${IPFS_SWARM_CONNMGR_LOWWATER:-}
- IPFS_SWARM_CONNMGR_TYPE=${IPFS_SWARM_CONNMGR_TYPE:-}
- IPFS_SWARM_DISABLENATPORTMAP=${IPFS_SWARM_DISABLENATPORTMAP:-}
- IPFS_SWARM_ENABLEHOLEPUNCHING=${IPFS_SWARM_ENABLEHOLEPUNCHING:-}
- IPFS_SWARM_RELAYCLIENT_ENABLED=${IPFS_SWARM_RELAYCLIENT_ENABLED:-}
- IPFS_SWARM_RELAYSERVICE_ENABLED=${IPFS_SWARM_RELAYSERVICE_ENABLED:-}
- IPFS_SWARM_TRANSPORTS_NETWORK_RELAY=${IPFS_SWARM_TRANSPORTS_NETWORK_RELAY:-}
image: ${DOCKER_REPOSITORY}/ipfs:${DOCKER_IMAGE_TAG}
labels:
- SERVICE_4001_CHECK_TCP=true
stack/logs.mk
+1 -1
View File
@@ -3,4 +3,4 @@ logs ?= sematext/logagent
# target app-build-logagent: Exec 'rm -Rf /root/.npm /log-buffer/*' in docker SERVICE
.PHONY: app-build-logagent
app-build-logagent:
$(call make,docker-compose-exec ARGS='rm -Rf /root/.npm /log-buffer/*' SERVICE=logagent)
$(call docker-compose-exec-sh,logagent,rm -Rf /root/.npm /log-buffer/*)
stack/node.mk
+2
View File
@@ -1,3 +1,4 @@
CMDS += node-exec stack-node-exec node-exec:% node-exec@% node-run node-run:% node-run@%
node ?= node/node
ENV_VARS += DOCKER_HOST_IFACE DOCKER_HOST_INET4 DOCKER_INTERNAL_DOCKER_HOST
@@ -10,6 +11,7 @@ bootstrap-stack-node: docker-network-create-$(DOCKER_NETWORK_PUBLIC) node-ssl-ce
node: stack-node-up
# target node-%; Fire target stack-node-%
.PHONY: node-%
node-%: stack-node-%;
# target node-ssl-certs: Create ${DOMAIN}.key.pem and ${DOMAIN}.crt.pem files
stack/node/ipfs/ipfs.yml
+10 -1
View File
@@ -8,7 +8,7 @@ services:
- IPFS_VERSION=${IPFS_VERSION}
context: ../..
dockerfile: docker/ipfs/Dockerfile
command: daemon --agent-version-suffix=${NODE_COMPOSE_PROJECT_NAME} --enable-gc --migrate
command: daemon --agent-version-suffix=${NODE_COMPOSE_PROJECT_NAME} ${IPFS_DAEMON_ARGS}
container_name: ${NODE_COMPOSE_PROJECT_NAME}-ipfs
cpus: 0.5
environment:
@@ -20,6 +20,7 @@ services:
- IPFS_ADDRESSES_GATEWAY_DOMAIN=${NODE_IPFS_ADDRESSES_GATEWAY_DOMAIN:-}
- IPFS_ADDRESSES_GATEWAY_INET4=${NODE_IPFS_ADDRESSES_GATEWAY_INET4:-}
- IPFS_ADDRESSES_GATEWAY_PORT=${NODE_IPFS_ADDRESSES_GATEWAY_PORT:-}
- IPFS_ADDRESSES_NOANNOUNCE=${NODE_IPFS_ADDRESSES_NOANNOUNCE:-}
- IPFS_API_HTTPHEADERS=${NODE_IPFS_API_HTTPHEADERS:-}
- IPFS_API_HTTPHEADERS_ACA_CREDENTIALS=${NODE_IPFS_API_HTTPHEADERS_ACA_CREDENTIALS:-}
- IPFS_API_HTTPHEADERS_ACA_HEADERS=${NODE_IPFS_API_HTTPHEADERS_ACA_HEADERS:-}
@@ -43,8 +44,16 @@ services:
- IPFS_PUBSUB_ENABLE=${NODE_IPFS_PUBSUB_ENABLE:-}
- IPFS_PUBSUB_ROUTER=${NODE_IPFS_PUBSUB_ROUTER:-}
- IPFS_ROUTING_TYPE=${NODE_IPFS_ROUTING_TYPE:-}
- IPFS_REPROVIDER_INTERVAL=${NODE_IPFS_REPROVIDER_INTERVAL:-}
- IPFS_REPROVIDER_STRATEGY=${NODE_IPFS_REPROVIDER_STRATEGY:-}
- IPFS_SWARM_CONNMGR_HIGHWATER=${NODE_IPFS_SWARM_CONNMGR_HIGHWATER:-}
- IPFS_SWARM_CONNMGR_LOWWATER=${NODE_IPFS_SWARM_CONNMGR_LOWWATER:-}
- IPFS_SWARM_CONNMGR_TYPE=${NODE_IPFS_SWARM_CONNMGR_TYPE:-}
- IPFS_SWARM_DISABLENATPORTMAP=${NODE_IPFS_SWARM_DISABLENATPORTMAP:-}
- IPFS_SWARM_ENABLEHOLEPUNCHING=${NODE_IPFS_SWARM_ENABLEHOLEPUNCHING:-}
- IPFS_SWARM_RELAYCLIENT_ENABLED=${NODE_IPFS_SWARM_RELAYCLIENT_ENABLED:-}
- IPFS_SWARM_RELAYSERVICE_ENABLED=${NODE_IPFS_SWARM_RELAYSERVICE_ENABLED:-}
- IPFS_SWARM_TRANSPORTS_NETWORK_RELAY=${NODE_IPFS_SWARM_TRANSPORTS_NETWORK_RELAY:-}
image: ${NODE_DOCKER_REPOSITORY}/ipfs:${DOCKER_IMAGE_TAG}
labels:
- SERVICE_4001_CHECK_TCP=true
stack/node/node.yml
+1
View File
@@ -92,6 +92,7 @@ services:
- consul
environment:
- CONSUL_HTTP_TOKEN=${NODE_CONSUL_HTTP_TOKEN}
- GL_DISABLE_VERSION_CHECK=true
extra_hosts:
- consul:${DOCKER_INTERNAL_DOCKER_HOST}
hostname: ${HOSTNAME}