diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-02-27 20:49:34 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-02-27 20:54:21 +0900 |
| commit | 6eaf36534a7948a95b9a4742d120d3e99f6007d6 (patch) | |
| tree | 4a7dd703d661e332aaa00fb75eea12fb7399c816 | |
| parent | 6d85a8f97c8c9e086f2f9b8c71fd730bff12af07 (diff) | |
| download | phperkaigi-2026-albatross-6eaf36534a7948a95b9a4742d120d3e99f6007d6.tar.gz phperkaigi-2026-albatross-6eaf36534a7948a95b9a4742d120d3e99f6007d6.tar.zst phperkaigi-2026-albatross-6eaf36534a7948a95b9a4742d120d3e99f6007d6.zip | |
feat(deploy): re-enable update-submodule workflow
| -rw-r--r-- | .github/workflows/update-submodule.yml | 9 | ||||
| -rw-r--r-- | compose.local.yaml | 2 | ||||
| -rw-r--r-- | compose.prod.yaml | 2 | ||||
| -rw-r--r-- | frontend/app/api/client.ts | 2 | ||||
| -rw-r--r-- | frontend/app/components/UserIcon.tsx | 2 | ||||
| -rw-r--r-- | frontend/app/pages/DashboardPage.tsx | 2 |
6 files changed, 10 insertions, 9 deletions
diff --git a/.github/workflows/update-submodule.yml b/.github/workflows/update-submodule.yml index 2c32a00..7ce099b 100644 --- a/.github/workflows/update-submodule.yml +++ b/.github/workflows/update-submodule.yml @@ -1,7 +1,8 @@ name: Update submodule on: push: - branches: [disable-temporarily] + branches: [main] + jobs: update-submodule: runs-on: ubuntu-latest @@ -15,12 +16,12 @@ jobs: - run: | cd nil.ninja - cd vhosts/t/albatross-php-2026 + cd services/albatross-php-2026 git fetch --prune origin git switch -d origin/main cd "$(git rev-parse --show-superproject-working-tree)" - git add vhosts/t/albatross-php-2026 + git add services/albatross-php-2026 git config user.name nsfisis git config user.email nsfisis@gmail.com - git commit -m "[automated] Update 'vhosts/t/albatross-php-2026' (${GITHUB_SHA})" + git commit -m "[automated] Update 'services/albatross-php-2026' (${GITHUB_SHA})" git push origin main diff --git a/compose.local.yaml b/compose.local.yaml index 7c06a7b..2d62f5a 100644 --- a/compose.local.yaml +++ b/compose.local.yaml @@ -3,7 +3,7 @@ services: build: context: ./backend ports: - - '127.0.0.1:8004:80' + - '127.0.0.1:8007:80' volumes: - files-data:/data/files:rw depends_on: diff --git a/compose.prod.yaml b/compose.prod.yaml index 5b9e346..1799601 100644 --- a/compose.prod.yaml +++ b/compose.prod.yaml @@ -2,7 +2,7 @@ services: reverse-proxy: image: nginx:1.27 ports: - - '127.0.0.1:8004:80' + - '127.0.0.1:8007:80' volumes: - ./nginx.conf:/etc/nginx/nginx.conf:ro - files-data:/var/www/files:ro diff --git a/frontend/app/api/client.ts b/frontend/app/api/client.ts index db5f8c8..acc1ee9 100644 --- a/frontend/app/api/client.ts +++ b/frontend/app/api/client.ts @@ -5,7 +5,7 @@ import type { paths } from "./schema"; const apiOrigin = import.meta.env.VITE_API_BASE_URL ?? - (import.meta.env.DEV ? "http://localhost:8004" : ""); + (import.meta.env.DEV ? "http://localhost:8007" : ""); const client = createClient<paths>({ baseUrl: `${apiOrigin}${API_BASE_PATH}`, diff --git a/frontend/app/components/UserIcon.tsx b/frontend/app/components/UserIcon.tsx index 2d17560..b2750dd 100644 --- a/frontend/app/components/UserIcon.tsx +++ b/frontend/app/components/UserIcon.tsx @@ -11,7 +11,7 @@ export default function UserIcon({ iconPath, displayName, className }: Props) { <img src={ process.env.NODE_ENV === "development" - ? `http://localhost:8004${BASE_PATH}${iconPath}` + ? `http://localhost:8007${BASE_PATH}${iconPath}` : `${BASE_PATH}${iconPath}` } alt={`${displayName} のアイコン`} diff --git a/frontend/app/pages/DashboardPage.tsx b/frontend/app/pages/DashboardPage.tsx index 92c0f04..7801739 100644 --- a/frontend/app/pages/DashboardPage.tsx +++ b/frontend/app/pages/DashboardPage.tsx @@ -114,7 +114,7 @@ export default function DashboardPage() { <a href={ import.meta.env.DEV - ? `http://localhost:8004${BASE_PATH}admin/dashboard` + ? `http://localhost:8007${BASE_PATH}admin/dashboard` : `${BASE_PATH}admin/dashboard` } className="text-lg text-white bg-sky-600 px-4 py-2 rounded-sm transition duration-300 hover:bg-sky-500 focus:ring-3 focus:ring-sky-400 focus:outline-hidden" |