diff --git a/.env.example b/.env.example index 5144b73..9bd1f07 100644 --- a/.env.example +++ b/.env.example @@ -22,4 +22,4 @@ EMAIL_USER="" EMAIL_PASSWORD="" ### Docker Driver options -DOCKER_DRIVER_PRIVATE_CA="" +DOCKER_DRIVER_PRIVATE_CA_PATH="" diff --git a/docker-compose.yml b/docker-compose.yml index cd27e45..f0c98a5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,7 +29,7 @@ configs: type: docker options: socket: /tmp/docker.sock - ${DOCKER_DRIVER_PRIVATE_CA:+privateCA: /mnt/docker_private_ca.pem} + ${DOCKER_DRIVER_PRIVATE_CA_PATH:+privateCA: ${DOCKER_DRIVER_PRIVATE_CA_PATH}} broker: url: mqtt://broker:1883 public_url: ws${TLS_ENABLED:+s}://mqtt.${DOMAIN:?error} @@ -38,8 +38,6 @@ configs: fileStore: enable: true url: http://file-server:3001 - flowfuse_docker_ca: - environment: DOCKER_DRIVER_PRIVATE_CA flowfuse_storage: content: | port: 3001 @@ -481,8 +479,6 @@ services: configs: - source: flowfuse target: /usr/src/forge/etc/flowforge.yml - - source: flowfuse_docker_ca - target: /mnt/docker_private_ca.pem volumes: - "/var/run/docker.sock:/tmp/docker.sock" - flowfuse-persistent-storage:/opt/persistent-storage