From c205a8afa002f06ff0c87fbe9d0a1cd561875afa Mon Sep 17 00:00:00 2001 From: Nick Yeoman Date: Sun, 17 Mar 2024 23:28:27 -0700 Subject: [PATCH] added monica and piwigo --- README.md | 2 ++ monica/docker-compose.yml | 47 ++++++++++++++++----------------------- piwigo/docker-compose.yml | 28 +++++++++++++++++++++++ 3 files changed, 49 insertions(+), 28 deletions(-) create mode 100644 piwigo/docker-compose.yml diff --git a/README.md b/README.md index 7e9641a..9d3e0cd 100644 --- a/README.md +++ b/README.md @@ -24,3 +24,5 @@ Which isn't ideal, but I don't know how to do this more elegantly. * mailtrain: https://hub.docker.com/r/mailtrain/mailtrain * portus: https://hub.docker.com/r/opensuse/portus/ * silverpeas: https://hub.docker.com/_/silverpeas +* grocy: https://github.com/grocy/grocy-docker/blob/main/docker-compose.yml + diff --git a/monica/docker-compose.yml b/monica/docker-compose.yml index f2281f4..ce8ca5d 100644 --- a/monica/docker-compose.yml +++ b/monica/docker-compose.yml @@ -24,34 +24,25 @@ networks: name: admin_web services: - monica: - # https://hub.docker.com/r/monicahq/monicahq - image: monicahq/monicahq:${MONICA_V} - depends_on: - - monica-db - networks: - - admin_web - ports: - - 80:80 + monica-db: + image: mariadb:latest + restart: unless-stopped volumes: - - monica:/var/www/monica/storage - restart: always - labels: - - "traefik.enable=true" - - "traefik.http.routers.${PREFIX}_monica.rule=Host(`${MONICA_DOMAIN_NAME}`)" - - "traefik.http.routers.${PREFIX}_monica.entrypoints=websecure" - - "traefik.http.routers.${PREFIX}_monica.tls.certresolver=letsencrypt" - - "traefik.http.services.${PREFIX}_monica.loadbalancer.server.port=8080" - - monica-db: - image: mariadb:${DB_V} - restart: always + - ./data/monica-db:/var/lib/mysql + command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-file-per-table=1 --skip-innodb-read-only-compressed environment: - - MYSQL_ROOT_PASSWORD=${MONICA_MYSQL_ROOT_PASSWORD} - - MYSQL_DATABASE=monica - - MYSQL_USER=homestead - - MYSQL_PASSWORD=${MONICA_MYSQL_PASSWORD} + MYSQL_ROOT_PASSWORD: changeme + MYSQL_USER: monica + MYSQL_PASSWORD: changeme + MYSQL_DATABASE: monica + + monica: + image: monica:latest + restart: unless-stopped volumes: - - monica-db:/var/lib/mysql - networks: - - admin_web + - ./data/monica:/var/www/html/storage + environment: + DB_HOST: monica-db + DB_USERNAME: monica + DB_PASSWORD: changeme + APP_ENV: production \ No newline at end of file diff --git a/piwigo/docker-compose.yml b/piwigo/docker-compose.yml new file mode 100644 index 0000000..240ec3a --- /dev/null +++ b/piwigo/docker-compose.yml @@ -0,0 +1,28 @@ + piwigo-db: + image: mariadb:11.2.2 # https://hub.docker.com/_/mariadb + restart: unless-stopped + command: --max_allowed_packet=32505856 + volumes: + - ./data/db:/var/lib/mysql + - "/etc/timezone:/etc/timezone:ro" + - "/etc/localtime:/etc/localtime:ro" + environment: + MYSQL_ROOT_PASSWORD: 3NcHCnWbkm7x + MYSQL_USER: piwigo + MYSQL_PASSWORD: text + MYSQL_DATABASE: piwigo + + piwigo: + image: lscr.io/linuxserver/piwigo:latest # https://hub.docker.com/r/linuxserver/piwigo/tags/ + restart: unless-stopped + volumes: + - ./data/piwigo:/config + - ./data/gallery:/gallery + - "/etc/timezone:/etc/timezone:ro" + - "/etc/localtime:/etc/localtime:ro" + environment: + - PUID=1000 + - PGID=1000 + - TZ=America/Vancouver + ports: + - 8203:80 \ No newline at end of file