diff --git a/wallabag/docker-compose.yml b/wallabag/docker-compose.yml index c8eacd1..c6e42c3 100644 --- a/wallabag/docker-compose.yml +++ b/wallabag/docker-compose.yml @@ -19,17 +19,26 @@ services: - wallabag-db:/var/lib/mysql networks: - admin_web - command: --max_allowed_packet=32505856 + command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --character-set-client-handshake=FALSE environment: MYSQL_ROOT_PASSWORD: ${WALLABAG_MYSQL_ROOT_PASSWORD} MYSQL_USER: wallabag MYSQL_PASSWORD: ${WALLABAG_MYSQL_PASSWORD} MYSQL_DATABASE: wallabag + MYSQL_ROOT_HOST: "172.18.0.20" wallabag: #https://hub.docker.com/r/wallabag/wallabag image: wallabag/wallabag:${WALLABAG_V} + healthcheck: + test: ["CMD", "curl" , "-f", "http://localhost:80"] + interval: 30s + timeout: 10s + retries: 5 environment: + - TZ=it-IT + - PUID=1000 + - PGID=1000 - MYSQL_ROOT_PASSWORD=${WALLABAG_MYSQL_ROOT_PASSWORD} - SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql - SYMFONY__ENV__DATABASE_HOST=${PREFIX}_wallabag-db_1 @@ -49,9 +58,10 @@ services: - wallabag:/var/www/wallabag/web/assets/images expose: - "80" + - "443" depends_on: - wallabag-db - link: + links: - wallabag-db networks: - admin_web @@ -60,7 +70,7 @@ services: - "traefik.http.routers.${PREFIX}_wallabag.rule=Host(`${WALLABAG_DOMAIN_NAME}`)" - "traefik.http.routers.${PREFIX}_wallabag.entrypoints=websecure" - "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: image: redis:5.0.9 diff --git a/wallabag/working.yml b/wallabag/working.yml new file mode 100644 index 0000000..9dc099b --- /dev/null +++ b/wallabag/working.yml @@ -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