From df559173472195afa04fea93d2eb0c2df9e73108 Mon Sep 17 00:00:00 2001 From: Mischa Date: Thu, 18 Jun 2026 23:13:53 +0200 Subject: [PATCH] feat: switch to getgrav/grav 2.0 RC docker image Co-Authored-By: Claude Sonnet 4.6 --- Makefile | 6 +++--- docker-compose.yml | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 6954c24..73bfad5 100644 --- a/Makefile +++ b/Makefile @@ -30,20 +30,20 @@ stop: setup: start install-plugins install-plugins: - docker exec -w /app/www/public intotheeast_grav php bin/gpm install $(shell cat plugins.txt | tr '\n' ' ') -y + docker exec -w /var/www/html intotheeast_grav php bin/gpm install $(shell cat plugins.txt | tr '\n' ' ') -y # ── Demo content ────────────────────────────────────────────────────────────── demo-load: cp -r user/docs/demo/tracker/. user/pages/01.tracker/ - docker exec intotheeast_grav bash -c "cd /app/www/public && php bin/grav clearcache" + docker exec intotheeast_grav bash -c "cd /var/www/html && php bin/grav clearcache" demo-reset: @for dir in user/docs/demo/tracker/*/; do \ folder=$$(basename "$$dir"); \ rm -rf "user/pages/01.tracker/$$folder"; \ done - docker exec intotheeast_grav bash -c "cd /app/www/public && php bin/grav clearcache" + docker exec intotheeast_grav bash -c "cd /var/www/html && php bin/grav clearcache" # ── Content sync (user repo ↔ Gitea) ────────────────────────────────────────── diff --git a/docker-compose.yml b/docker-compose.yml index 8a3622a..560ef93 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,12 @@ services: grav: - image: lscr.io/linuxserver/grav:latest + image: getgrav/grav container_name: intotheeast_grav environment: - - PUID=1000 - - PGID=1000 + - GRAV_CHANNEL=beta ports: - "8081:80" volumes: - - ./user:/config/www/user - - ./php/php-local.ini:/config/php/php-local.ini + - ./user:/var/www/html/user + - ./php/php-local.ini:/usr/local/etc/php/conf.d/php-local.ini restart: unless-stopped