Skip to content

refactor: rename compose/dev to compose/web #553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2023
Merged

refactor: rename compose/dev to compose/web #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions compose/desktop/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
- pnpm-store:/codepod/.pnpm-store
command: sh -c "corepack enable && pnpm install && echo '=== Setup Finished, idling ===' && tail -f /dev/null"

desktop-api:
api:
image: node:18
working_dir: /codepod/apps/desktop-api
ports:
Expand All @@ -28,7 +28,7 @@ services:
- pnpm-store:/codepod/.pnpm-store
command: sh -c "corepack enable && pnpm dev"

desktop-yjs:
yjs:
image: node:18
working_dir: /codepod/apps/desktop-yjs
ports:
Expand All @@ -40,7 +40,7 @@ services:
- /var/run/docker.sock:/var/run/docker.sock
command: sh -c "corepack enable && pnpm dev"

desktop-ui:
ui:
image: node:18
working_dir: /codepod/apps/desktop-ui
ports:
Expand Down
2 changes: 1 addition & 1 deletion compose/dev/.env.example → compose/web/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
COMPOSE_PROJECT_NAME=mydev
# COMPOSE_PROJECT_NAME=mystackname

POSTGRES_USER=myuser
POSTGRES_PASSWORD=mypassword
Expand Down
0 compose/dev/Dockerfile → compose/web/Dockerfile
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions compose/dev/compose.yml → compose/web/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ services:
environment:
DATABASE_URL: "postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}?schema=public"

web-api:
api:
image: node:18
working_dir: /codepod/apps/web-api
ports:
Expand Down Expand Up @@ -69,7 +69,7 @@ services:
environment:
KERNEL_TTL: "43200000"
LOOP_INTERVAL: "60000"
YJS_WS_URL: "ws://web-yjs:4233/socket"
YJS_WS_URL: "ws://yjs:4233/socket"
JWT_SECRET: ${JWT_SECRET}

spawner-docker:
Expand Down Expand Up @@ -101,10 +101,10 @@ services:
WS_RUNTIME_IMAGE: "lihebi/codepod-runtime:0.4.13-alpha.49"
# spawner need to add routes to proxy server
# PROXY_API_URL: "http://proxy:4011/graphql"
YJS_WS_URL: "ws://web-yjs:4233/socket"
YJS_WS_URL: "ws://yjs:4233/socket"
JWT_SECRET: ${JWT_SECRET}

web-yjs:
yjs:
image: node:18
working_dir: /codepod/apps/web-yjs
ports:
Expand All @@ -118,7 +118,7 @@ services:
DATABASE_URL: "postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}?schema=public"
JWT_SECRET: ${JWT_SECRET}

web-ui:
ui:
image: node:18
working_dir: /codepod/apps/web-ui
ports:
Expand Down