From: Giorgio Ravera Date: Fri, 22 May 2020 11:55:21 +0000 (+0200) Subject: Minor update X-Git-Url: http://git.giorgioravera.it/?a=commitdiff_plain;h=dcc1c392eb029f73ef1bc3c54b8104e4449f0204;p=docker.git Minor update --- diff --git a/homeassistant/docker-compose.yaml.host b/homeassistant/docker-compose.yaml.host index ef2536d..2dbd0c3 100644 --- a/homeassistant/docker-compose.yaml.host +++ b/homeassistant/docker-compose.yaml.host @@ -3,7 +3,7 @@ version: '3' services: homeassistant: container_name: homeassistant - image: homeassistant/home-assistant:stable + image: homeassistant/home-assistant:latest #command: --log-file /config/log/home-assistant.log restart: always #ports: @@ -14,7 +14,7 @@ services: environment: - TZ=${DOCKER_TZ} #privileged: true - dns: 192.168.0.254 192.168.0.1 + dns: 192.168.0.254 volumes: - ${DOCKER_CFG_DIR}/homeassistant:/config network_mode: host @@ -34,7 +34,7 @@ services: zigbee2mqtt: container_name: zigbee2mqtt - image: koenkk/zigbee2mqtt + image: koenkk/zigbee2mqtt:latest restart: always depends_on: - mosquitto diff --git a/xen-orchestra-ce/docker-compose.yaml b/xen-orchestra-ce/docker-compose.yaml index 4436f84..c1e43e8 100644 --- a/xen-orchestra-ce/docker-compose.yaml +++ b/xen-orchestra-ce/docker-compose.yaml @@ -4,27 +4,26 @@ services: orchestra: container_name: XO_server image: ezka77/xen-orchestra-ce:latest + #image: ezka77/xen-orchestra-ce:5.58 restart: unless-stopped #ports: - # - 8080:8000 + # - "8000:8000" depends_on: - redis environment: - DEBUG=xo:main - NODE_ENV=production - XOA_PLAN=5 - # To enable XO superuser features (ex: NFS mount) on the host - # uncomment the following lines, it will start XO as superuser - # and enable the privileged capabilities for this container (access - # host devices, ...) NB: it's a security issue, so be warned ! - #- USER=root - TZ=${DOCKER_TZ} #privileged: true + # SYS_ADMIN should be enough capability to use NFS mount + cap_add: + - SYS_ADMIN volumes: - - ${DOCKER_CFG_DIR}/xen-orchestra-ce:/storage + - ${DOCKER_CFG_DIR}/xen-orchestra-ce/xo-data:/storage networks: - proxy - logging: &logging + logging: &default_logging driver: "json-file" options: max-size: "1M" @@ -51,11 +50,11 @@ services: environment: - TZ=${DOCKER_TZ} volumes: - - ${DOCKER_CFG_DIR}/xen-orchestra-ce:/data + - ${DOCKER_CFG_DIR}/xen-orchestra-ce/redis-data:/data networks: - proxy logging: - <<: *logging + <<: *default_logging networks: proxy: