Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions docker/dev/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ services:
VITE_SCRIPT_API_URL: ${SCRIPT_API_URL}
VITE_SCRIPT_FRONTEND_URL: ${SCRIPT_FRONTEND_URL}
VITE_SCRIPT_ILPAY_URL: ${SCRIPT_ILPAY_URL}
VITE_INIT_SCRIPT_URL: ${SCRIPT_EMBED_URL}
VITE_SCRIPT_EMBED_URL: ${SCRIPT_EMBED_URL}
ports:
- '5100:5100'
expose:
Expand All @@ -49,7 +49,7 @@ services:
API_URL: ${API_URL}
ILPAY_URL: ${SCRIPT_ILPAY_URL}
FRONTEND_URL: ${SCRIPT_FRONTEND_URL}
INIT_SCRIPT_URL: ${SCRIPT_EMBED_URL}
SCRIPT_EMBED_URL: ${SCRIPT_EMBED_URL}
networks:
- wm-tools
command: pnpm run dev
Expand Down
4 changes: 2 additions & 2 deletions docker/prod/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ services:
VITE_SCRIPT_API_URL: ${SCRIPT_API_URL}
VITE_SCRIPT_FRONTEND_URL: ${SCRIPT_FRONTEND_URL}
VITE_SCRIPT_ILPAY_URL: ${SCRIPT_ILPAY_URL}
VITE_INIT_SCRIPT_URL: ${SCRIPT_EMBED_URL}
VITE_SCRIPT_EMBED_URL: ${SCRIPT_EMBED_URL}
ports:
- '5100:5100'
expose:
Expand All @@ -41,7 +41,7 @@ services:
API_URL: ${API_URL}
ILPAY_URL: ${SCRIPT_ILPAY_URL}
FRONTEND_URL: ${SCRIPT_FRONTEND_URL}
INIT_SCRIPT_URL: ${SCRIPT_EMBED_URL}
SCRIPT_EMBED_URL: ${SCRIPT_EMBED_URL}
networks:
- wm-tools
depends_on:
Expand Down
4 changes: 3 additions & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,12 @@ RUN pnpm --filter frontend build
ARG VITE_SCRIPT_API_URL
ARG VITE_SCRIPT_FRONTEND_URL
ARG VITE_SCRIPT_ILPAY_URL
ARG VITE_SCRIPT_EMBED_URL

ENV VITE_SCRIPT_API_URL=$VITE_SCRIPT_API_URL \
VITE_SCRIPT_FRONTEND_URL=$VITE_SCRIPT_FRONTEND_URL \
VITE_SCRIPT_ILPAY_URL=$VITE_SCRIPT_ILPAY_URL
VITE_SCRIPT_ILPAY_URL=$VITE_SCRIPT_ILPAY_URL \
VITE_SCRIPT_EMBED_URL=$VITE_SCRIPT_EMBED_URL

RUN pnpm --filter frontend build:init

Expand Down
4 changes: 3 additions & 1 deletion frontend/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ EXPOSE 5100
ARG VITE_SCRIPT_API_URL
ARG VITE_SCRIPT_FRONTEND_URL
ARG VITE_SCRIPT_ILPAY_URL
ARG VITE_SCRIPT_EMBED_URL

ENV VITE_SCRIPT_API_URL=$VITE_SCRIPT_API_URL \
VITE_SCRIPT_FRONTEND_URL=$VITE_SCRIPT_FRONTEND_URL \
VITE_SCRIPT_ILPAY_URL=$VITE_SCRIPT_ILPAY_URL
VITE_SCRIPT_ILPAY_URL=$VITE_SCRIPT_ILPAY_URL \
VITE_SCRIPT_EMBED_URL=$VITE_SCRIPT_EMBED_URL

WORKDIR /app/frontend

Expand Down
2 changes: 1 addition & 1 deletion frontend/app/routes/create.$type.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export async function loader({ params, request }: LoaderFunctionArgs) {
const defaultConfig: ElementConfigType = apiResponse?.payload?.default

const ilpayUrl = process.env.ILPAY_URL || ''
const scriptInitUrl = process.env.INIT_SCRIPT_URL || ''
const scriptInitUrl = process.env.VITE_SCRIPT_EMBED_URL || ''

return {
elementType,
Expand Down