wip: letsencrypt

stack/node/exporter/exporter.yml

@@ -7,7 +7,7 @@ services:
     image: google/cadvisor:latest
     labels:
     - SERVICE_8080_CHECK_TCP=true
-    - SERVICE_8080_NAME=${NODE_COMPOSE_SERVICE_NAME}-cadvisor-exporter:8080
+    - SERVICE_8080_NAME=${NODE_COMPOSE_SERVICE_NAME}-cadvisor-exporter-8080
     - SERVICE_8080_TAGS=${NODE_CADVISOR_EXPORTER_SERVICE_8080_TAGS}
     - SERVICE_9200_IGNORE=true
     networks:
@@ -31,7 +31,7 @@ services:
     image: prom/node-exporter:latest
     labels:
     - SERVICE_9100_CHECK_TCP=true
-    - SERVICE_9100_NAME=${NODE_COMPOSE_SERVICE_NAME}-node-exporter:9100
+    - SERVICE_9100_NAME=${NODE_COMPOSE_SERVICE_NAME}-node-exporter-9100
     - SERVICE_9100_TAGS=${NODE_EXPORTER_SERVICE_9100_TAGS}
     networks:
     - public

stack/node/ipfs/ipfs.yml

@@ -57,11 +57,11 @@ services:
     image: ${NODE_DOCKER_REPOSITORY}/ipfs:${DOCKER_IMAGE_TAG}
     labels:
     - SERVICE_4001_CHECK_TCP=true
-    - SERVICE_4001_NAME=${NODE_COMPOSE_SERVICE_NAME}-ipfs:4001
+    - SERVICE_4001_NAME=${NODE_COMPOSE_SERVICE_NAME}-ipfs-4001
     - SERVICE_5001_CHECK_TCP=true
-    - SERVICE_5001_NAME=${NODE_COMPOSE_SERVICE_NAME}-ipfs:5001
+    - SERVICE_5001_NAME=${NODE_COMPOSE_SERVICE_NAME}-ipfs-5001
     - SERVICE_8080_CHECK_HTTP=${NODE_IPFS_SERVICE_8080_CHECK_TCP}
-    - SERVICE_8080_NAME=${NODE_COMPOSE_SERVICE_NAME}-ipfs:8080
+    - SERVICE_8080_NAME=${NODE_COMPOSE_SERVICE_NAME}-ipfs-8080
     - SERVICE_8080_TAGS=${NODE_IPFS_SERVICE_8080_TAGS}
     - SERVICE_8081_IGNORE=true
     network_mode: host

stack/node/node.yml

@@ -1,6 +1,19 @@
 version: '3.6'
 
 services:
+  certbot:
+    build:
+      args:
+      - DOCKER_BUILD_DIR=docker/certbot
+      context: ../..
+      dockerfile: docker/certbot/Dockerfile
+    command: start
+    container_name: ${NODE_COMPOSE_PROJECT_NAME}-certbot
+    image: ${NODE_DOCKER_REPOSITORY}/certbot:${DOCKER_IMAGE_TAG}
+    network_mode: host
+    restart: always
+    volumes:
+    - myos:/etc/letsencrypt
   consul:
     build:
       args:
@@ -31,7 +44,7 @@ services:
     - SERVICE_8301_IGNORE=true
     - SERVICE_8302_IGNORE=true
     - SERVICE_8500_CHECK_HTTP=/v1/health/service/consul
-    - SERVICE_8500_NAME=${NODE_COMPOSE_SERVICE_NAME}-consul:8500
+    - SERVICE_8500_NAME=${NODE_COMPOSE_SERVICE_NAME}-consul-8500
     - SERVICE_8500_TAGS=${NODE_CONSUL_SERVICE_8500_TAGS}
     - SERVICE_8600_IGNORE=true
     - SERVICE_ADDRESS=${DOCKER_HOST_INET4}
@@ -40,20 +53,19 @@ services:
     restart: always
     volumes:
     - consul:/consul/data:delegated
-    - myos:/certs:ro
     - /var/run/docker.sock:/var/run/docker.sock
   fabio:
     build:
       args:
       - DOCKER_BUILD_DIR=docker/fabio
-      - FABIO_VERSION=1.6.0
+      - FABIO_VERSION=1.6.2
       - SYSTEM=${SYSTEM}
       - MACHINE=${MACHINE}
       context: ../..
       dockerfile: docker/fabio/Dockerfile
     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"
+    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=/etc/letsencrypt/live/${DOMAIN}/fullchain.pem;key=/etc/letsencrypt/live/${DOMAIN}/privkey.pem"
     depends_on:
     - consul
     extra_hosts:
@@ -61,11 +73,11 @@ services:
     hostname: ${HOSTNAME}
     labels:
     - SERVICE_80_CHECK_TCP=true
-    - SERVICE_80_NAME=${NODE_COMPOSE_SERVICE_NAME}-fabio:80
+    - SERVICE_80_NAME=${NODE_COMPOSE_SERVICE_NAME}-fabio-80
     - SERVICE_443_CHECK_TCP=true
-    - SERVICE_443_NAME=${NODE_COMPOSE_SERVICE_NAME}-fabio:443
+    - SERVICE_443_NAME=${NODE_COMPOSE_SERVICE_NAME}-fabio-443
     - SERVICE_9998_CHECK_HTTP=/routes
-    - SERVICE_9998_NAME=${NODE_COMPOSE_SERVICE_NAME}-fabio:9998
+    - SERVICE_9998_NAME=${NODE_COMPOSE_SERVICE_NAME}-fabio-9998
     - SERVICE_9998_TAGS=${NODE_FABIO_SERVICE_9998_TAGS}
     - SERVICE_9999_IGNORE=true
     ports:
@@ -76,7 +88,7 @@ services:
     - public
     restart: always
     volumes:
-    - myos:/certs:ro
+    - myos:/etc/letsencrypt:ro
   registrator:
     build:
       args:

stack/node/portainer/portainer.yml

@@ -7,7 +7,7 @@ services:
     labels:
     - SERVICE_8000_IGNORE=true
     - SERVICE_9000_CHECK_HTTP=/
-    - SERVICE_9000_NAME=${NODE_COMPOSE_SERVICE_NAME}-portainer:9000
+    - SERVICE_9000_NAME=${NODE_COMPOSE_SERVICE_NAME}-portainer-9000
     - SERVICE_9000_TAGS=${NODE_PORTAINER_SERVICE_9000_TAGS}
     networks:
     - public

stack/node/vsftpd/vsftpd-s3.yml

@@ -28,9 +28,9 @@ services:
     image: ${NODE_DOCKER_REPOSITORY}/vsftpd-s3:${DOCKER_IMAGE_TAG}
     labels:
     - SERVICE_21_CHECK_TCP=true
-    - SERVICE_21_NAME=${NODE_COMPOSE_SERVICE_NAME}-vsftpd-s3:21
+    - SERVICE_21_NAME=${NODE_COMPOSE_SERVICE_NAME}-vsftpd-s3-21
     - SERVICE_22_CHECK_TCP=true
-    - SERVICE_22_NAME=${NODE_COMPOSE_SERVICE_NAME}-vsftpd-s3:22
+    - SERVICE_22_NAME=${NODE_COMPOSE_SERVICE_NAME}-vsftpd-s3-22
     - SERVICE_65000_IGNORE=true
     security_opt:
     - apparmor:unconfined