Compare commits

...

2 Commits

Author SHA1 Message Date
Henit Chobisa
2ec9d646e3 chore: added asset prefix for loading static assets with /space/ asset prefix 2023-08-22 10:10:32 +00:00
Henit Chobisa
82cc1f0ed8 fix: Plane-App not taking correct env for plane-deploy url 2023-08-22 09:14:44 +00:00
5 changed files with 9 additions and 8 deletions

View File

@ -55,7 +55,8 @@ COPY --from=installer --chown=captain:plane /app/apps/app/.next ./apps/app/.next
ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000 ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \ ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL BUILT_NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
NEXT_PUBLIC_DEPLOY_URL=$NEXT_PUBLIC_DEPLOY_URL
USER root USER root
COPY replace-env-vars.sh /usr/local/bin/ COPY replace-env-vars.sh /usr/local/bin/

View File

@ -51,7 +51,7 @@ COPY --from=installer /app/apps/space/package.json .
# https://nextjs.org/docs/advanced-features/output-file-tracing # https://nextjs.org/docs/advanced-features/output-file-tracing
COPY --from=installer --chown=captain:plane /app/apps/space/.next/standalone ./ COPY --from=installer --chown=captain:plane /app/apps/space/.next/standalone ./
COPY --from=installer --chown=captain:plane /app/apps/space/.next ./apps/space/.next COPY --from=installer --chown=captain:plane /app/apps/space/.next/static ./apps/space/.next/static
ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000 ARG NEXT_PUBLIC_API_BASE_URL=http://localhost:8000
ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \ ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL \
@ -62,9 +62,5 @@ COPY replace-env-vars.sh /usr/local/bin/
COPY start.sh /usr/local/bin/ COPY start.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/replace-env-vars.sh RUN chmod +x /usr/local/bin/replace-env-vars.sh
RUN chmod +x /usr/local/bin/start.sh RUN chmod +x /usr/local/bin/start.sh
USER captain USER captain
ENV NEXT_TELEMETRY_DISABLED 1 ENV NEXT_TELEMETRY_DISABLED 1
EXPOSE 3000

View File

@ -2,6 +2,7 @@
const path = require("path"); const path = require("path");
const nextConfig = { const nextConfig = {
assetPrefix: '/spaces/',
reactStrictMode: false, reactStrictMode: false,
swcMinify: true, swcMinify: true,
experimental: { experimental: {

View File

@ -69,10 +69,13 @@ services:
NEXT_PUBLIC_API_BASE_URL: http://localhost:8000 NEXT_PUBLIC_API_BASE_URL: http://localhost:8000
restart: always restart: always
command: /usr/local/bin/start.sh apps/space/server.js space command: /usr/local/bin/start.sh apps/space/server.js space
expose:
- 4000
env_file: env_file:
- .env - .env
environment: environment:
NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL} NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL}
PORT: 4000
depends_on: depends_on:
- plane-api - plane-api
- plane-worker - plane-worker

View File

@ -16,7 +16,7 @@ server {
} }
location /spaces/ { location /spaces/ {
proxy_pass http://planedeploy:3000/; proxy_pass http://planedeploy:4000/;
} }
location /api/ { location /api/ {