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

ipfs v0.14.0 (kubo)

Browse Source
This commit is contained in:
Yann Autissier
2022-08-24 11:34:07 +02:00
parent 069713b923
commit f212978388
22 changed files with 157 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stack/User/User.yml
+12 -5
View File
@@ -8,7 +8,7 @@ services:
- GID=${GID}
- GIT_AUTHOR_NAME=${GIT_AUTHOR_NAME}
- GIT_AUTHOR_EMAIL=${GIT_AUTHOR_EMAIL}
- IPFS_VERSION=0.13.0
- IPFS_VERSION=${IPFS_VERSION}
- UID=${UID}
- USER=${USER}
- SSH_BASTION_HOSTNAME=${SSH_BASTION_HOSTNAME}
@@ -17,7 +17,7 @@ services:
- SSH_PRIVATE_IP_RANGE=${SSH_PRIVATE_IP_RANGE}
context: ../..
dockerfile: docker/myos/Dockerfile
container_name: ${DOCKER_NAME}
container_name: ${USER_DOCKER_NAME}
environment:
- ENV=${ENV}
- RC_00_SOURCE=${USER_MYOS_RC_SOURCE}
@@ -27,22 +27,29 @@ services:
- RC_04_TMUX_ATTACH=${USER_MYOS_RC_TMUX_ATTACH}
- RC_05_SCREEN_ATTACH=${USER_MYOS_RC_SCREEN_ATTACH}
- SHELL=${DOCKER_SHELL}
image: ${DOCKER_IMAGE}
image: ${USER_DOCKER_IMAGE}
networks:
- private
restart: always
user: ${UID}:${GID}
volumes:
# - ${HOME}:${HOME}:cached
- ${MONOREPO_DIR}:${MONOREPO_DIR}:cached
- monorepo:${MONOREPO_DIR}:cached
- myos:/tmp/ssh-agent
# - /var/run/docker.sock:/var/run/docker.sock
working_dir: ${MONOREPO_DIR}
volumes:
monorepo:
driver: local
driver_opts:
type: none
device: ${MONOREPO_DIR}
o: bind
name: ${USER_COMPOSE_PROJECT_NAME}
myos:
external: true
name: ${DOCKER_VOLUME}
name: ${USER_DOCKER_VOLUME}
networks:
private:
stack/ipfs.mk
+4
View File
@@ -1,3 +1,7 @@
ENV_VARS += IPFS_PROFILE IPFS_VERSION
IPFS_PROFILE ?= $(if $(filter-out amd64 x86_64,$(PROCESSOR_ARCHITECTURE)),lowpower,server)
IPFS_VERSION ?= 0.14.0
.PHONY: bootstrap-stack-ipfs
bootstrap-stack-ipfs: ~/.ipfs
stack/ipfs/ipfs.yml
+36 -36
View File
@@ -5,51 +5,50 @@ services:
build:
args:
- DOCKER_BUILD_DIR=docker/ipfs
- IPFS_VERSION=0.13.0
- IPFS_VERSION=${IPFS_VERSION}
- UID=${UID}
context: ../..
dockerfile: docker/ipfs/Dockerfile
command: daemon --agent-version-suffix=${COMPOSE_PROJECT_NAME} --enable-gc --migrate
cpus: 0.5
environment:
- IPFS_ADDRESSES_API=${IPFS_ADDRESSES_API}
- IPFS_ADDRESSES_API_DOMAIN=${IPFS_ADDRESSES_API_DOMAIN}
- IPFS_ADDRESSES_API_INET4=${IPFS_ADDRESSES_API_INET4}
- IPFS_ADDRESSES_API_PORT=${IPFS_ADDRESSES_API_PORT}
- IPFS_ADDRESSES_GATEWAY=${IPFS_ADDRESSES_GATEWAY}
- 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_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}
- IPFS_API_HTTPHEADERS_ACA_METHODS=${IPFS_API_HTTPHEADERS_ACA_METHODS}
- IPFS_API_HTTPHEADERS_ACA_ORIGIN=${IPFS_API_HTTPHEADERS_ACA_ORIGIN}
- IPFS_BOOTSTRAP=${IPFS_BOOTSTRAP}
- IPFS_DATASTORE_GCPERIOD=${IPFS_DATASTORE_GCPERIOD}
- IPFS_DISK_USAGE_PERCENT=${IPFS_DISK_USAGE_PERCENT}
- IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT=${IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT}
- IPFS_EXPERIMENTAL_FILESTOREENABLED=${IPFS_EXPERIMENTAL_FILESTOREENABLED}
- IPFS_EXPERIMENTAL_GRAPHSYNCENABLED=${IPFS_EXPERIMENTAL_GRAPHSYNCENABLED}
- IPFS_EXPERIMENTAL_LIBP2PSTREAMMOUNTING=${IPFS_EXPERIMENTAL_LIBP2PSTREAMMOUNTING}
- IPFS_EXPERIMENTAL_P2PHTTPPROXY=${IPFS_EXPERIMENTAL_P2PHTTPPROXY}
- IPFS_EXPERIMENTAL_STRATEGICPROVIDING=${IPFS_EXPERIMENTAL_STRATEGICPROVIDING}
- IPFS_EXPERIMENTAL_URLSTOREENABLED=${IPFS_EXPERIMENTAL_URLSTOREENABLED}
- IPFS_IPNS_REPUBLISHPERIOD=${IPFS_IPNS_REPUBLISHPERIOD}
- IPFS_IPNS_RECORDLIFETIME=${IPFS_IPNS_RECORDLIFETIME}
- IPFS_IPNS_USEPUBSUB=${IPFS_IPNS_USEPUBSUB}
- IPFS_LOGGING=${IPFS_LOGGING}
- IPFS_PROFILE=${IPFS_PROFILE}
- IPFS_PUBSUB_ENABLE=${IPFS_PUBSUB_ENABLE}
- IPFS_PUBSUB_ROUTER=${IPFS_PUBSUB_ROUTER}
- IPFS_ROUTING_TYPE=${IPFS_ROUTING_TYPE}
- IPFS_SWARM_CONNMGR_HIGHWATER=${IPFS_SWARM_CONNMGR_HIGHWATER}
- IPFS_SWARM_CONNMGR_LOWWATER=${IPFS_SWARM_CONNMGR_LOWWATER}
- IPFS_ADDRESSES_API=${IPFS_ADDRESSES_API:-}
- IPFS_ADDRESSES_API_DOMAIN=${IPFS_ADDRESSES_API_DOMAIN:-}
- IPFS_ADDRESSES_API_INET4=${IPFS_ADDRESSES_API_INET4:-}
- IPFS_ADDRESSES_API_PORT=${IPFS_ADDRESSES_API_PORT:-}
- IPFS_ADDRESSES_GATEWAY=${IPFS_ADDRESSES_GATEWAY:-}
- 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_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:-}
- IPFS_API_HTTPHEADERS_ACA_METHODS=${IPFS_API_HTTPHEADERS_ACA_METHODS:-}
- IPFS_API_HTTPHEADERS_ACA_ORIGIN=${IPFS_API_HTTPHEADERS_ACA_ORIGIN:-}
- IPFS_BOOTSTRAP=${IPFS_BOOTSTRAP:-}
- IPFS_DATASTORE_GCPERIOD=${IPFS_DATASTORE_GCPERIOD:-}
- IPFS_DISK_USAGE_PERCENT=${IPFS_DISK_USAGE_PERCENT:-}
- IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT=${IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT:-}
- IPFS_EXPERIMENTAL_FILESTOREENABLED=${IPFS_EXPERIMENTAL_FILESTOREENABLED:-}
- IPFS_EXPERIMENTAL_GRAPHSYNCENABLED=${IPFS_EXPERIMENTAL_GRAPHSYNCENABLED:-}
- IPFS_EXPERIMENTAL_LIBP2PSTREAMMOUNTING=${IPFS_EXPERIMENTAL_LIBP2PSTREAMMOUNTING:-}
- IPFS_EXPERIMENTAL_P2PHTTPPROXY=${IPFS_EXPERIMENTAL_P2PHTTPPROXY:-}
- IPFS_EXPERIMENTAL_STRATEGICPROVIDING=${IPFS_EXPERIMENTAL_STRATEGICPROVIDING:-}
- IPFS_EXPERIMENTAL_URLSTOREENABLED=${IPFS_EXPERIMENTAL_URLSTOREENABLED:-}
- IPFS_IPNS_REPUBLISHPERIOD=${IPFS_IPNS_REPUBLISHPERIOD:-}
- IPFS_IPNS_RECORDLIFETIME=${IPFS_IPNS_RECORDLIFETIME:-}
- IPFS_IPNS_USEPUBSUB=${IPFS_IPNS_USEPUBSUB:-}
- IPFS_LOGGING=${IPFS_LOGGING:-}
- IPFS_PROFILE=${IPFS_PROFILE:-}
- IPFS_PUBSUB_ENABLE=${IPFS_PUBSUB_ENABLE:-}
- IPFS_PUBSUB_ROUTER=${IPFS_PUBSUB_ROUTER:-}
- IPFS_ROUTING_TYPE=${IPFS_ROUTING_TYPE:-}
- IPFS_SWARM_CONNMGR_HIGHWATER=${IPFS_SWARM_CONNMGR_HIGHWATER:-}
- IPFS_SWARM_CONNMGR_LOWWATER=${IPFS_SWARM_CONNMGR_LOWWATER:-}
image: ${DOCKER_REPOSITORY}/ipfs:${DOCKER_IMAGE_TAG}
labels:
- SERVICE_4001_CHECK_TCP=true
- SERVICE_4001_NAME=${COMPOSE_SERVICE_NAME}-ipfs:4001
- SERVICE_5001_CHECK_TCP=true
- SERVICE_5001_NAME=${COMPOSE_SERVICE_NAME}-ipfs:5001
- SERVICE_8080_CHECK_HTTP=${IPFS_SERVICE_8080_CHECK_TCP}
- SERVICE_8080_NAME=${COMPOSE_SERVICE_NAME}-ipfs:8080
@@ -59,7 +58,8 @@ services:
- private
- public
ports:
- 4001
- 4001/tcp
- 4001/udp
- 5001/tcp
- 8080/tcp
restart: always
stack/node.mk
+4 -5
View File
@@ -1,6 +1,5 @@
node ?= node/node node/portainer
ENV_VARS += DOCKER_HOST_IFACE DOCKER_HOST_INET4 DOCKER_INTERNAL_DOCKER_HOST IPFS_PROFILE
IPFS_PROFILE ?= $(if $(filter-out amd64 x86_64,$(PROCESSOR_ARCHITECTURE)),lowpower,server)
node ?= node/node
ENV_VARS += DOCKER_HOST_IFACE DOCKER_HOST_INET4 DOCKER_INTERNAL_DOCKER_HOST
# target bootstrap-stack-node: Fire node-ssl-certs
.PHONY: bootstrap-stack-node
@@ -16,8 +15,8 @@ node-%: stack-node-%;
# target node-ssl-certs: Create ${DOMAIN}.key.pem and ${DOMAIN}.crt.pem files
.PHONY: node-ssl-certs
node-ssl-certs:
docker run --rm --mount source=$(NODE_COMPOSE_PROJECT_NAME)_ssl-certs,target=/certs alpine [ -f /certs/$(DOMAIN).crt.pem -a -f /certs/$(DOMAIN).key.pem ] \
|| $(RUN) docker run --rm -e DOMAIN=$(DOMAIN) --mount source=$(NODE_COMPOSE_PROJECT_NAME)_ssl-certs,target=/certs alpine sh -c "\
docker run --rm --mount source=$(NODE_DOCKER_VOLUME),target=/certs alpine [ -f /certs/$(DOMAIN).crt.pem -a -f /certs/$(DOMAIN).key.pem ] \
|| $(RUN) docker run --rm -e DOMAIN=$(DOMAIN) --mount source=$(NODE_DOCKER_VOLUME),target=/certs alpine sh -c "\
apk --no-cache add openssl \
&& { [ -f /certs/${DOMAIN}.key.pem ] || openssl genrsa -out /certs/${DOMAIN}.key.pem 2048; } \
&& openssl req -key /certs/${DOMAIN}.key.pem -out /certs/${DOMAIN}.crt.pem \
stack/node/exporter/exporter.yml
+2 -2
View File
@@ -2,7 +2,7 @@ version: '3.6'
services:
cadvisor-exporter:
container_name: ${NODE_COMPOSE_PROJECT_NAME}_cadvisor-exporter
container_name: ${NODE_COMPOSE_PROJECT_NAME}-cadvisor-exporter
hostname: ${HOSTNAME}
image: google/cadvisor:latest
labels:
@@ -26,7 +26,7 @@ services:
- "^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)"
- '--path.procfs=/host/proc'
- '--path.sysfs=/host/sys'
container_name: ${NODE_COMPOSE_PROJECT_NAME}_node-exporter
container_name: ${NODE_COMPOSE_PROJECT_NAME}-node-exporter
hostname: ${HOSTNAME}
image: prom/node-exporter:latest
labels:
stack/node/ipfs/ipfs.yml
+36 -42
View File
@@ -5,46 +5,46 @@ services:
build:
args:
- DOCKER_BUILD_DIR=docker/ipfs
- IPFS_VERSION=0.13.0
- IPFS_VERSION=${IPFS_VERSION}
context: ../..
dockerfile: docker/ipfs/Dockerfile
command: daemon --agent-version-suffix=${NODE_COMPOSE_PROJECT_NAME} --enable-gc --migrate
container_name: ${NODE_COMPOSE_PROJECT_NAME}_ipfs
container_name: ${NODE_COMPOSE_PROJECT_NAME}-ipfs
cpus: 0.5
environment:
- IPFS_ADDRESSES_API=${NODE_IPFS_ADDRESSES_API}
- IPFS_ADDRESSES_API_DOMAIN=${NODE_IPFS_ADDRESSES_API_DOMAIN}
- IPFS_ADDRESSES_API_INET4=${NODE_IPFS_ADDRESSES_API_INET4}
- IPFS_ADDRESSES_API_PORT=${NODE_IPFS_ADDRESSES_API_PORT}
- IPFS_ADDRESSES_GATEWAY=${NODE_IPFS_ADDRESSES_GATEWAY}
- 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_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}
- IPFS_API_HTTPHEADERS_ACA_METHODS=${NODE_IPFS_API_HTTPHEADERS_ACA_METHODS}
- IPFS_API_HTTPHEADERS_ACA_ORIGIN=${NODE_IPFS_API_HTTPHEADERS_ACA_ORIGIN}
- IPFS_BOOTSTRAP=${NODE_IPFS_BOOTSTRAP}
- IPFS_DATASTORE_GCPERIOD=${NODE_IPFS_DATASTORE_GCPERIOD}
- IPFS_DISK_USAGE_PERCENT=${NODE_IPFS_DISK_USAGE_PERCENT}
- IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT=${NODE_IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT}
- IPFS_EXPERIMENTAL_FILESTOREENABLED=${NODE_IPFS_EXPERIMENTAL_FILESTOREENABLED}
- IPFS_EXPERIMENTAL_GRAPHSYNCENABLED=${NODE_IPFS_EXPERIMENTAL_GRAPHSYNCENABLED}
- IPFS_EXPERIMENTAL_LIBP2PSTREAMMOUNTING=${NODE_IPFS_EXPERIMENTAL_LIBP2PSTREAMMOUNTING}
- IPFS_EXPERIMENTAL_P2PHTTPPROXY=${NODE_IPFS_EXPERIMENTAL_P2PHTTPPROXY}
- IPFS_EXPERIMENTAL_STRATEGICPROVIDING=${NODE_IPFS_EXPERIMENTAL_STRATEGICPROVIDING}
- IPFS_EXPERIMENTAL_URLSTOREENABLED=${NODE_IPFS_EXPERIMENTAL_URLSTOREENABLED}
- IPFS_IPNS_REPUBLISHPERIOD=${NODE_IPFS_IPNS_REPUBLISHPERIOD}
- IPFS_IPNS_RECORDLIFETIME=${NODE_IPFS_IPNS_RECORDLIFETIME}
- IPFS_IPNS_USEPUBSUB=${NODE_IPFS_IPNS_USEPUBSUB}
- IPFS_LOGGING=${NODE_IPFS_LOGGING}
- IPFS_PROFILE=${IPFS_PROFILE}
- IPFS_PUBSUB_ENABLE=${NODE_IPFS_PUBSUB_ENABLE}
- IPFS_PUBSUB_ROUTER=${NODE_IPFS_PUBSUB_ROUTER}
- IPFS_ROUTING_TYPE=${NODE_IPFS_ROUTING_TYPE}
- IPFS_SWARM_CONNMGR_HIGHWATER=${NODE_IPFS_SWARM_CONNMGR_HIGHWATER}
- IPFS_SWARM_CONNMGR_LOWWATER=${NODE_IPFS_SWARM_CONNMGR_LOWWATER}
- IPFS_ADDRESSES_API=${NODE_IPFS_ADDRESSES_API:-}
- IPFS_ADDRESSES_API_DOMAIN=${NODE_IPFS_ADDRESSES_API_DOMAIN:-}
- IPFS_ADDRESSES_API_INET4=${NODE_IPFS_ADDRESSES_API_INET4:-}
- IPFS_ADDRESSES_API_PORT=${NODE_IPFS_ADDRESSES_API_PORT:-}
- IPFS_ADDRESSES_GATEWAY=${NODE_IPFS_ADDRESSES_GATEWAY:-}
- 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_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:-}
- IPFS_API_HTTPHEADERS_ACA_METHODS=${NODE_IPFS_API_HTTPHEADERS_ACA_METHODS:-}
- IPFS_API_HTTPHEADERS_ACA_ORIGIN=${NODE_IPFS_API_HTTPHEADERS_ACA_ORIGIN:-}
- IPFS_BOOTSTRAP=${NODE_IPFS_BOOTSTRAP:-}
- IPFS_DATASTORE_GCPERIOD=${NODE_IPFS_DATASTORE_GCPERIOD:-}
- IPFS_DISK_USAGE_PERCENT=${NODE_IPFS_DISK_USAGE_PERCENT:-}
- IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT=${NODE_IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT:-}
- IPFS_EXPERIMENTAL_FILESTOREENABLED=${NODE_IPFS_EXPERIMENTAL_FILESTOREENABLED:-}
- IPFS_EXPERIMENTAL_GRAPHSYNCENABLED=${NODE_IPFS_EXPERIMENTAL_GRAPHSYNCENABLED:-}
- IPFS_EXPERIMENTAL_LIBP2PSTREAMMOUNTING=${NODE_IPFS_EXPERIMENTAL_LIBP2PSTREAMMOUNTING:-}
- IPFS_EXPERIMENTAL_P2PHTTPPROXY=${NODE_IPFS_EXPERIMENTAL_P2PHTTPPROXY:-}
- IPFS_EXPERIMENTAL_STRATEGICPROVIDING=${NODE_IPFS_EXPERIMENTAL_STRATEGICPROVIDING:-}
- IPFS_EXPERIMENTAL_URLSTOREENABLED=${NODE_IPFS_EXPERIMENTAL_URLSTOREENABLED:-}
- IPFS_IPNS_REPUBLISHPERIOD=${NODE_IPFS_IPNS_REPUBLISHPERIOD:-}
- IPFS_IPNS_RECORDLIFETIME=${NODE_IPFS_IPNS_RECORDLIFETIME:-}
- IPFS_IPNS_USEPUBSUB=${NODE_IPFS_IPNS_USEPUBSUB:-}
- IPFS_LOGGING=${NODE_IPFS_LOGGING:-}
- IPFS_PROFILE=${IPFS_PROFILE:-}
- IPFS_PUBSUB_ENABLE=${NODE_IPFS_PUBSUB_ENABLE:-}
- IPFS_PUBSUB_ROUTER=${NODE_IPFS_PUBSUB_ROUTER:-}
- IPFS_ROUTING_TYPE=${NODE_IPFS_ROUTING_TYPE:-}
- IPFS_SWARM_CONNMGR_HIGHWATER=${NODE_IPFS_SWARM_CONNMGR_HIGHWATER:-}
- IPFS_SWARM_CONNMGR_LOWWATER=${NODE_IPFS_SWARM_CONNMGR_LOWWATER:-}
image: ${NODE_DOCKER_REPOSITORY}/ipfs:${DOCKER_IMAGE_TAG}
labels:
- SERVICE_4001_CHECK_TCP=true
@@ -55,12 +55,7 @@ services:
- SERVICE_8080_NAME=${NODE_COMPOSE_SERVICE_NAME}-ipfs:8080
- SERVICE_8080_TAGS=${NODE_IPFS_SERVICE_8080_TAGS}
- SERVICE_8081_IGNORE=true
networks:
- public
ports:
- 4001:4001
- 5001/tcp
- 8080/tcp
network_mode: host
restart: always
ulimits:
nofile:
@@ -71,7 +66,6 @@ services:
volumes:
ipfs:
name: ${NODE_COMPOSE_PROJECT_NAME}_ipfs
networks:
public:
stack/node/node.yml
+7 -8
View File
@@ -8,7 +8,7 @@ services:
- DOCKER_BUILD_DIR=docker/consul
context: ../..
dockerfile: docker/consul/Dockerfile
container_name: ${NODE_COMPOSE_PROJECT_NAME}_consul
container_name: ${NODE_COMPOSE_PROJECT_NAME}-consul
image: ${NODE_DOCKER_REPOSITORY}/consul:${DOCKER_IMAGE_TAG}
environment:
CONSUL_BIND_INTERFACE: '${DOCKER_HOST_IFACE}'
@@ -40,7 +40,7 @@ services:
restart: always
volumes:
- consul:/consul/data:delegated
- ssl-certs:/certs:ro
- myos:/certs:ro
- /var/run/docker.sock:/var/run/docker.sock
fabio:
build:
@@ -51,7 +51,7 @@ services:
- PROCESSOR_ARCHITECTURE=${PROCESSOR_ARCHITECTURE}
context: ../..
dockerfile: docker/fabio/Dockerfile
container_name: ${NODE_COMPOSE_PROJECT_NAME}_fabio
container_name: ${NODE_COMPOSE_PROJECT_NAME}-fabio
image: ${NODE_DOCKER_REPOSITORY}/fabio:${DOCKER_IMAGE_TAG}
command: -registry.backend "consul" -registry.consul.addr "consul:8500" -registry.consul.token "${NODE_CONSUL_HTTP_TOKEN}" -proxy.addr ":80,:443;cs=local" -proxy.cs "cs=local;type=file;cert=/certs/${DOMAIN}.crt.pem;key=/certs/${DOMAIN}.key.pem"
depends_on:
@@ -76,7 +76,7 @@ services:
- public
restart: always
volumes:
- ssl-certs:/certs:ro
- myos:/certs:ro
registrator:
build:
args:
@@ -85,7 +85,7 @@ services:
- GIT_AUTHOR_EMAIL=${GIT_AUTHOR_EMAIL}
context: ../..
dockerfile: docker/registrator/Dockerfile
container_name: ${NODE_COMPOSE_PROJECT_NAME}_registrator
container_name: ${NODE_COMPOSE_PROJECT_NAME}-registrator
image: ${NODE_DOCKER_REPOSITORY}/registrator:${DOCKER_IMAGE_TAG}
command: -internal -cleanup -deregister always -resync=30 -useIpFromNetwork "${DOCKER_NETWORK_PUBLIC}" -useIpFromLabel SERVICE_ADDRESS consul://consul:8500
depends_on:
@@ -102,10 +102,9 @@ services:
volumes:
consul:
name: ${NODE_COMPOSE_PROJECT_NAME}_consul
ssl-certs:
myos:
external: true
name: ${NODE_COMPOSE_PROJECT_NAME}_ssl-certs
name: ${NODE_DOCKER_VOLUME}
networks:
public:
stack/node/pdns/pdns-recursor.yml
+1 -1
View File
@@ -8,7 +8,7 @@ services:
context: ../..
dockerfile: docker/pdns-server/Dockerfile
command: /usr/local/sbin/pdns_recursor --local-address='192.168.0.1:53' --allow-from='127.0.0.0/8, 192.168.1.0/24, 172.16.0.0/12'
container_name: ${NODE_COMPOSE_PROJECT_NAME}_pdns-recursor
container_name: ${NODE_COMPOSE_PROJECT_NAME}-pdns-recursor
hostname: ${HOSTNAME}
image: ${NODE_DOCKER_REPOSITORY}/pdns-recursor:${DOCKER_IMAGE_TAG}
network_mode: host
stack/node/portainer/portainer.yml
+1 -1
View File
@@ -2,6 +2,7 @@ version: '3.6'
services:
portainer:
container_name: ${NODE_COMPOSE_PROJECT_NAME}-portainer
image: portainer/portainer:latest
labels:
- SERVICE_8000_IGNORE=true
@@ -20,7 +21,6 @@ services:
volumes:
portainer:
name: ${NODE_COMPOSE_PROJECT_NAME}_portainer
networks:
public:
stack/node/vsftpd/vsftpd-s3.yml
+1 -1
View File
@@ -9,7 +9,7 @@ services:
dockerfile: docker/vsftpd-s3/Dockerfile
cap_add:
- sys_admin
container_name: ${NODE_COMPOSE_PROJECT_NAME}_vsftpd-s3
container_name: ${NODE_COMPOSE_PROJECT_NAME}-vsftpd-s3
devices:
- /dev/fuse
environment:
stack/theia/theia.yml
+5 -4
View File
@@ -32,7 +32,7 @@ services:
restart: always
volumes:
- monorepo:/Sources:cached
- ssh-agent:/tmp/ssh-agent:ro
- myos:/tmp/ssh-agent:ro
- /var/run/docker.sock:/var/run/docker.sock
volumes:
@@ -42,9 +42,10 @@ volumes:
type: none
device: ${MONOREPO_DIR}
o: bind
ssh-agent:
external:
name: ${DOCKER_VOLUME}
name: ${USER_COMPOSE_PROJECT_NAME}
myos:
external: true
name: ${USER_DOCKER_VOLUME}
networks:
private:
stack/x2go/xfce_debian.yml
+6 -6
View File
@@ -27,19 +27,19 @@ services:
- seccomp=unconfined # ecryptfs
tty: true
volumes:
- home:/home:delegated
- shared:/shared:cached
- shm:/dev/shm:delegated
- vdi-home:/home:delegated
- vdi-shared:/shared:cached
- vdi-shm:/dev/shm:delegated
volumes:
home:
shared:
vdi-home:
vdi-shared:
driver: local
driver_opts:
type: none
device: /mnt/shared
o: bind
shm:
vdi-shm:
driver: local
driver_opts:
type: tmpfs
stack/zen/zen.yml
+4 -5
View File
@@ -8,7 +8,7 @@ services:
- GID=${GID}
- GIT_AUTHOR_NAME=${GIT_AUTHOR_NAME}
- GIT_AUTHOR_EMAIL=${GIT_AUTHOR_EMAIL}
- IPFS_VERSION=0.13.0
- IPFS_VERSION=${IPFS_VERSION}
- UID=${UID}
- USER=${USER}
context: ../..
@@ -27,18 +27,17 @@ services:
volumes:
- astroport:${HOME}/astroport:cached
- ipfs:${HOME}/.ipfs:cached,ro
- myos:/tmp/ssh-agent:ro
- zen:${HOME}/.zen:delegated
- ssh-agent:/tmp/ssh-agent:ro
working_dir: ${HOME}/.zen
volumes:
astroport:
ipfs:
external: true
name: ${COMPOSE_PROJECT_NAME}_ipfs
ssh-agent:
myos:
external: true
name: ${DOCKER_VOLUME}
name: ${USER_DOCKER_VOLUME}
zen:
driver: local
driver_opts: