diff --git a/.env.default b/.env.default index 9750bc6..6852afd 100644 --- a/.env.default +++ b/.env.default @@ -19,7 +19,7 @@ HOST_SELFOSS=selfoss HOST_SHAARLI=shaarli HOST_WALLABAG=wallabag HOST_WWW=www -HOST_DASHY=dashy.traefik.me +FQDN_DASHBOARD=dashboard.traefik.me PATH_PORTAINER=/portainer PATH_GLANCES=/glances PATH_DELUGE=/deluge @@ -28,6 +28,8 @@ PATH_DELUGE=/deluge TZ=Europe/Paris BASIC_AUTH=test:$$apr1$$H6uskkkW$$IgXLP6ewTrSuBkTrqE8wj/ ROOT_INSTALL=/srv +PUID=1000 +PGID=1000 # torrent DELUGE_TORRENT_PORT=6881 diff --git a/www/docker-compose.dashy.yml b/www/docker-compose.dashy.yml new file mode 100755 index 0000000..2f7af42 --- /dev/null +++ b/www/docker-compose.dashy.yml @@ -0,0 +1,39 @@ +version: '3.8' + +services: + dashy: + # To build from source, replace 'image: lissy93/dashy' with 'build: .' + # build: . + image: lissy93/dashy + container_name: dashy + profiles: ["disabled"] + # Pass in your config file below, by specifying the path on your host machine + volumes: + - ${ROOT_INSTALL}/data/dashy/config.yml:/app/public/conf.yml + # Set any environmental variables + environment: + - NODE_ENV=production + # Specify your user ID and group ID. You can find this by running `id -u` and `id -g` + # - UID=1000 + # - GID=1000 + # Specify restart policy + restart: unless-stopped + # Configure healthchecks + #healthcheck: + # test: ['CMD', 'node', '/app/services/healthcheck'] + # interval: 1m30s + # timeout: 10s + # retries: 3 + # start_period: 40s + networks: + - wwww-frontend + expose: + - 80 + labels: + - traefik.enable=true + - traefik.http.routers.dashy.rule=Host(`${FQDN_DASHBOARD}`) + - traefik.http.routers.dashy.entrypoints=https + - traefik.http.routers.dashy.tls=true + - traefik.docker.network=wwww-frontend + + diff --git a/www/docker-compose.heimdall.yml b/www/docker-compose.heimdall.yml new file mode 100755 index 0000000..e0427a2 --- /dev/null +++ b/www/docker-compose.heimdall.yml @@ -0,0 +1,25 @@ +version: '3.8' + +services: + heimdall: + image: lscr.io/linuxserver/heimdall + container_name: heimdall + environment: + - PUID=${PUID} + - PGID=${PGID} + - TZ=${TZ} + volumes: + - ${ROOT_INSTALL}/data/heimdall:/config + expose: + - 80 + networks: + - wwww-frontend + restart: unless-stopped + labels: + - traefik.enable=true + - traefik.http.routers.dashy.rule=Host(`${FQDN_DASHBOARD}`) + - traefik.http.routers.dashy.entrypoints=https + - traefik.http.routers.dashy.tls=true + - traefik.docker.network=wwww-frontend + + diff --git a/www/docker-compose.www.yml b/www/docker-compose.www.yml index 575e719..209e154 100755 --- a/www/docker-compose.www.yml +++ b/www/docker-compose.www.yml @@ -1,39 +1,6 @@ version: '3.8' -services: - dashy: - # To build from source, replace 'image: lissy93/dashy' with 'build: .' - # build: . - image: lissy93/dashy - container_name: dashy - # Pass in your config file below, by specifying the path on your host machine - volumes: - - ${ROOT_INSTALL}/data/dashy/config.yml:/app/public/conf.yml - # Set any environmental variables - environment: - - NODE_ENV=production - # Specify your user ID and group ID. You can find this by running `id -u` and `id -g` - # - UID=1000 - # - GID=1000 - # Specify restart policy - restart: unless-stopped - # Configure healthchecks - #healthcheck: - # test: ['CMD', 'node', '/app/services/healthcheck'] - # interval: 1m30s - # timeout: 10s - # retries: 3 - # start_period: 40s - networks: - - wwww-frontend - expose: - - 80 - labels: - - traefik.enable=true - - traefik.http.routers.dashy.rule=Host(`${HOST_DASHY}`) - - traefik.http.routers.dashy.entrypoints=https - - traefik.http.routers.dashy.tls=true - - traefik.docker.network=wwww-frontend +services: www: container_name: www image: kianby/www-madyanne