not quite working (wallabag)

This commit is contained in:
2020-04-28 19:37:10 -07:00
parent c6c12557b0
commit 1652556eaa
2 changed files with 43 additions and 3 deletions
+13 -3
View File
@@ -19,17 +19,26 @@ services:
- wallabag-db:/var/lib/mysql - wallabag-db:/var/lib/mysql
networks: networks:
- admin_web - admin_web
command: --max_allowed_packet=32505856 command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --character-set-client-handshake=FALSE
environment: environment:
MYSQL_ROOT_PASSWORD: ${WALLABAG_MYSQL_ROOT_PASSWORD} MYSQL_ROOT_PASSWORD: ${WALLABAG_MYSQL_ROOT_PASSWORD}
MYSQL_USER: wallabag MYSQL_USER: wallabag
MYSQL_PASSWORD: ${WALLABAG_MYSQL_PASSWORD} MYSQL_PASSWORD: ${WALLABAG_MYSQL_PASSWORD}
MYSQL_DATABASE: wallabag MYSQL_DATABASE: wallabag
MYSQL_ROOT_HOST: "172.18.0.20"
wallabag: wallabag:
#https://hub.docker.com/r/wallabag/wallabag #https://hub.docker.com/r/wallabag/wallabag
image: wallabag/wallabag:${WALLABAG_V} image: wallabag/wallabag:${WALLABAG_V}
healthcheck:
test: ["CMD", "curl" , "-f", "http://localhost:80"]
interval: 30s
timeout: 10s
retries: 5
environment: environment:
- TZ=it-IT
- PUID=1000
- PGID=1000
- MYSQL_ROOT_PASSWORD=${WALLABAG_MYSQL_ROOT_PASSWORD} - MYSQL_ROOT_PASSWORD=${WALLABAG_MYSQL_ROOT_PASSWORD}
- SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql - SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql
- SYMFONY__ENV__DATABASE_HOST=${PREFIX}_wallabag-db_1 - SYMFONY__ENV__DATABASE_HOST=${PREFIX}_wallabag-db_1
@@ -49,9 +58,10 @@ services:
- wallabag:/var/www/wallabag/web/assets/images - wallabag:/var/www/wallabag/web/assets/images
expose: expose:
- "80" - "80"
- "443"
depends_on: depends_on:
- wallabag-db - wallabag-db
link: links:
- wallabag-db - wallabag-db
networks: networks:
- admin_web - admin_web
@@ -60,7 +70,7 @@ services:
- "traefik.http.routers.${PREFIX}_wallabag.rule=Host(`${WALLABAG_DOMAIN_NAME}`)" - "traefik.http.routers.${PREFIX}_wallabag.rule=Host(`${WALLABAG_DOMAIN_NAME}`)"
- "traefik.http.routers.${PREFIX}_wallabag.entrypoints=websecure" - "traefik.http.routers.${PREFIX}_wallabag.entrypoints=websecure"
- "traefik.http.routers.${PREFIX}_wallabag.tls.certresolver=letsencrypt" - "traefik.http.routers.${PREFIX}_wallabag.tls.certresolver=letsencrypt"
- "traefik.http.services.${PREFIX}_wallabag.loadbalancer.server.port=80" - "traefik.http.services.${PREFIX}_wallabag.loadbalancer.server.port=443"
wallabag-redis: wallabag-redis:
image: redis:5.0.9 image: redis:5.0.9
+30
View File
@@ -0,0 +1,30 @@
version: '3'
services:
wallabag:
image: wallabag/wallabag
environment:
- MYSQL_ROOT_PASSWORD=wallaroot
- SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql
- SYMFONY__ENV__DATABASE_HOST=db
- SYMFONY__ENV__DATABASE_PORT=3306
- SYMFONY__ENV__DATABASE_NAME=wallabag
- SYMFONY__ENV__DATABASE_USER=wallabag
- SYMFONY__ENV__DATABASE_PASSWORD=wallapass
- SYMFONY__ENV__DATABASE_CHARSET=utf8mb4
- SYMFONY__ENV__MAILER_HOST=127.0.0.1
- SYMFONY__ENV__MAILER_USER=~
- SYMFONY__ENV__MAILER_PASSWORD=~
- SYMFONY__ENV__FROM_EMAIL=wallabag@example.com
- SYMFONY__ENV__DOMAIN_NAME=https://kim.nickyeoman.com:8000
ports:
- 8000:80
volumes:
- /opt/wallabag/images:/var/www/wallabag/web/assets/images
db:
image: mariadb
environment:
- MYSQL_ROOT_PASSWORD=wallaroot
volumes:
- /opt/wallabag/data:/var/lib/mysql
redis:
image: redis:alpine