From 8af4b7d9a2063539f104ed890b963d6b8e74c956 Mon Sep 17 00:00:00 2001
From: Yax <1949284+kianby@users.noreply.github.com>
Date: Wed, 6 Oct 2021 20:14:28 +0200
Subject: [PATCH] fix wallbag and glances
---
glances/docker-compose.glances.yml | 5 ++---
wallabag/docker-compose.wallabag.yml | 9 ++-------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/glances/docker-compose.glances.yml b/glances/docker-compose.glances.yml
index 8452459..7494f54 100755
--- a/glances/docker-compose.glances.yml
+++ b/glances/docker-compose.glances.yml
@@ -3,16 +3,15 @@ version: '3'
services:
glances:
container_name: glances
- image: nicolargo/glances:3.2.0
+ image: nicolargo/glances:3.2.3.1
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
- environment:
- - GLANCES_OPT="-w"
pid: host
networks:
- srv
expose:
- 61208
environment:
+ - GLANCES_OPT=-w
- VIRTUAL_HOST=${HOST_GLANCES}.${DOMAIN}
- VIRTUAL_PORT=61208
diff --git a/wallabag/docker-compose.wallabag.yml b/wallabag/docker-compose.wallabag.yml
index 8e71157..a487998 100755
--- a/wallabag/docker-compose.wallabag.yml
+++ b/wallabag/docker-compose.wallabag.yml
@@ -4,13 +4,6 @@ services:
wallabag:
container_name: wallabag
environment:
- MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASSWORD}
- SYMFONY__ENV__DOMAIN_NAME: https://${HOST_WALLABAG}.${DOMAIN}
- SYMFONY__ENV__FOSUSER_REGISTRATION: "false"
- SYMFONY__ENV__FROM_EMAIL: ${ADMIN_EMAIL}
- SYMFONY__ENV__MAILER_HOST: 127.0.0.1
- SYMFONY__ENV__MAILER_PASSWORD: '~'
- SYMFONY__ENV__MAILER_USER: '~'
image: wallabag/wallabag
networks:
- srv
@@ -20,6 +13,8 @@ services:
- wallabag_data:/var/www/wallabag/data:rw
- wallabag_images:/var/www/wallabag/web/assets/images:rw
environment:
+ - SYMFONY__ENV__DOMAIN_NAME="https://${HOST_WALLABAG}.${DOMAIN}"
+ - SYMFONY__ENV__FOSUSER_REGISTRATION=false
- VIRTUAL_HOST=${HOST_WALLABAG}.${DOMAIN}
volumes: