From 7d9febbd100d161d10e18258892992f3be03cb02 Mon Sep 17 00:00:00 2001 From: syui Date: Mon, 5 May 2025 11:13:48 +0900 Subject: [PATCH] fix --- compose.yml | 27 +++--- install.zsh | 5 -- patching/120-ozone-runtimeEnvVars.diff | 119 ------------------------- 3 files changed, 13 insertions(+), 138 deletions(-) delete mode 100644 patching/120-ozone-runtimeEnvVars.diff diff --git a/compose.yml b/compose.yml index 73c44ce..813393a 100644 --- a/compose.yml +++ b/compose.yml @@ -109,20 +109,19 @@ services: env_file: - ./envs/jetstream -# ozone: -# build: -# context: ./repos/ozone/ -# ports: -# - 2585:3000 -# restart: always -# volumes: -# - ./data/ozone/:/data/ -# - ./repos/atproto/services/ozone/api.js:/app/services/ozone/api.js:ro -# env_file: -# - ./envs/ozone -# depends_on: -# database: -# condition: service_healthy + ozone-web: + build: + context: ./repos/ozone/ + ports: + - 2586:3000 + restart: always + volumes: + - ./data/ozone/:/data/ + env_file: + - ./envs/ozone + depends_on: + database: + condition: service_healthy ozone: build: diff --git a/install.zsh b/install.zsh index 4324b2a..d04d511 100755 --- a/install.zsh +++ b/install.zsh @@ -151,13 +151,8 @@ function at-repos-ozone-patch() { cd $d/repos d_=$d/repos/ozone rm -rf ${d_} - p_=$d/patching/120-ozone-runtimeEnvVars.diff git clone https://github.com/bluesky-social/ozone cd ${d_} - pushd ${d_} - echo "applying patch: under ${d_} for ${p_}" - patch -p1 < ${p_} - popd p_=$d/patching/122-ozone-enable-daemon.diff echo "applying patch: under ${d_} for ${p_}" diff --git a/patching/120-ozone-runtimeEnvVars.diff b/patching/120-ozone-runtimeEnvVars.diff deleted file mode 100644 index 4f369a8..0000000 --- a/patching/120-ozone-runtimeEnvVars.diff +++ /dev/null @@ -1,119 +0,0 @@ -diff --git a/app/layout.tsx b/app/layout.tsx -index bfc3470..9350629 100644 ---- a/app/layout.tsx -+++ b/app/layout.tsx -@@ -5,6 +5,7 @@ import 'yet-another-react-lightbox/styles.css' - import 'yet-another-react-lightbox/plugins/thumbnails.css' - import 'yet-another-react-lightbox/plugins/captions.css' - import { ToastContainer } from 'react-toastify' -+import { PublicEnvScript } from 'next-runtime-env'; - - import { Shell } from '@/shell/Shell' - import { CommandPaletteRoot } from '@/shell/CommandPalette/Root' -@@ -36,6 +37,7 @@ export default function RootLayout({ - isDarkModeEnabled() ? 'dark' : '' - }`} - > -+ - Ozone - - -+ -+ - - blueSkyUrlMatcher.test(url) - -diff --git a/package.json b/package.json -index 8919841..750dce9 100644 ---- a/package.json -+++ b/package.json -@@ -37,6 +37,7 @@ - "kbar": "^0.1.0-beta.45", - "lande": "^1.0.10", - "next": "15.2.4", -+ "next-runtime-env": "^3.2.1", - "react": "19.1.0", - "react-dom": "19.1.0", - "react-dropzone": "^14.3.5",