From 996e602774cafad6f300a2915799190fa6729324 Mon Sep 17 00:00:00 2001 From: finn Date: Thu, 19 Mar 2026 16:13:21 -0700 Subject: [PATCH] restore nc stuff --- compose.yaml | 28 ++++++++++++++++++++++++++++ compose.yaml.local | 40 ++++++++++++++++++++++++++++++++++------ compose.yaml.prod | 38 +++++++++++++++++++++++++++++++++----- 3 files changed, 95 insertions(+), 11 deletions(-) diff --git a/compose.yaml b/compose.yaml index 54faef2..079dfe4 100644 --- a/compose.yaml +++ b/compose.yaml @@ -152,9 +152,37 @@ services: networks: - frontnet + nextcloud: + image: nextcloud:latest + restart: always + container_name: nextcloud + volumes: + - nextcloud-data:/var/www/html + - nextcloud-apps:/var/www/html/custom_apps + - nextcloud-config:/var/www/html/config + - nextcloud-data:/var/www/html/data + environment: + - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.oily.dad + - MYSQL_HOST=db + - MYSQL_DATABASE=nextcloud + - MYSQL_USER=nextcloud + - MYSQL_PASSWORD=${DOTENV_MYSQL_NEXTCLOUD_PASSWORD} + - NEXTCLOUD_ADMIN_USER=admin + - NEXTCLOUD_ADMIN_PASSWORD=${DOTENV_NEXTCLOUD_ADMIN_PASSWORD} + - NEXTCLOUD_DATA_DIR=/var/www/html/data + networks: + - backnet + - frontnet + depends_on: + db: + condition: service_healthy + volumes: db-data: pmb-root: + nextcloud-data: + nextcloud-apps: + nextcloud-config: networks: backnet: diff --git a/compose.yaml.local b/compose.yaml.local index 896c92d..079dfe4 100644 --- a/compose.yaml.local +++ b/compose.yaml.local @@ -81,7 +81,7 @@ services: - GITEA__server__LANDING_PAGE=explore - GITEA__ui__REACTIONS="+1, -1, fu, heart, laugh, confused, hooray, eyes, gun, boom, poop, kiss, rocket, bomb, chart_with_downwards_trend, eggplant" # To disable new users after setup: - - GITEA__service__DISABLE_REGISTRATION=false + - GITEA__service__DISABLE_REGISTRATION=true networks: - backnet - frontnet @@ -121,11 +121,11 @@ services: - frontnet pmb: - #build: - # args: - # GPG_PP: $BUILD_GPG_PP - # context: pmb-pf - # dockerfile: Dockerfile + build: + args: + GPG_PP: $BUILD_GPG_PP + context: pmb-pf + dockerfile: Dockerfile image: site_pmb:latest expose: - "25" @@ -152,9 +152,37 @@ services: networks: - frontnet + nextcloud: + image: nextcloud:latest + restart: always + container_name: nextcloud + volumes: + - nextcloud-data:/var/www/html + - nextcloud-apps:/var/www/html/custom_apps + - nextcloud-config:/var/www/html/config + - nextcloud-data:/var/www/html/data + environment: + - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.oily.dad + - MYSQL_HOST=db + - MYSQL_DATABASE=nextcloud + - MYSQL_USER=nextcloud + - MYSQL_PASSWORD=${DOTENV_MYSQL_NEXTCLOUD_PASSWORD} + - NEXTCLOUD_ADMIN_USER=admin + - NEXTCLOUD_ADMIN_PASSWORD=${DOTENV_NEXTCLOUD_ADMIN_PASSWORD} + - NEXTCLOUD_DATA_DIR=/var/www/html/data + networks: + - backnet + - frontnet + depends_on: + db: + condition: service_healthy + volumes: db-data: pmb-root: + nextcloud-data: + nextcloud-apps: + nextcloud-config: networks: backnet: diff --git a/compose.yaml.prod b/compose.yaml.prod index 8726f96..d27eecc 100644 --- a/compose.yaml.prod +++ b/compose.yaml.prod @@ -121,11 +121,11 @@ services: - frontnet pmb: - #build: - # args: - # GPG_PP: $BUILD_GPG_PP - # context: pmb-pf - # dockerfile: Dockerfile + build: + args: + GPG_PP: $BUILD_GPG_PP + context: pmb-pf + dockerfile: Dockerfile image: site_pmb:latest expose: - "25" @@ -152,9 +152,37 @@ services: networks: - frontnet + nextcloud: + image: nextcloud:latest + restart: always + container_name: nextcloud + volumes: + - nextcloud-data:/var/www/html + - nextcloud-apps:/var/www/html/custom_apps + - nextcloud-config:/var/www/html/config + - nextcloud-data:/var/www/html/data + environment: + - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.oily.dad + - MYSQL_HOST=db + - MYSQL_DATABASE=nextcloud + - MYSQL_USER=nextcloud + - MYSQL_PASSWORD=${DOTENV_MYSQL_NEXTCLOUD_PASSWORD} + - NEXTCLOUD_ADMIN_USER=admin + - NEXTCLOUD_ADMIN_PASSWORD=${DOTENV_NEXTCLOUD_ADMIN_PASSWORD} + - NEXTCLOUD_DATA_DIR=/var/www/html/data + networks: + - backnet + - frontnet + depends_on: + db: + condition: service_healthy + volumes: db-data: pmb-root: + nextcloud-data: + nextcloud-apps: + nextcloud-config: networks: backnet: