4nk/lecoffre-front
4
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge Dev in Staging

Browse Source
This commit is contained in:
Arnaud D. Natali 2023-11-07 10:59:34 +01:00 committed by GitHub
commit 5f47f329b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -23,6 +23,7 @@ COPY --from=deps leCoffre-front/node_modules ./node_modules
COPY --from=deps leCoffre-front/package.json package.json COPY --from=deps leCoffre-front/package.json package.json
COPY tsconfig.json tsconfig.json COPY tsconfig.json tsconfig.json
COPY src src COPY src src
COPY .env .env
RUN npm run build RUN npm run build
@ -34,6 +35,7 @@ WORKDIR leCoffre-front
RUN adduser -D lecoffreuser --uid 10000 && chown -R lecoffreuser . RUN adduser -D lecoffreuser --uid 10000 && chown -R lecoffreuser .
COPY public ./public COPY public ./public
COPY --from=builder --chown=lecoffreuser leCoffre-front/.env ./.env
COPY --from=builder --chown=lecoffreuser leCoffre-front/node_modules ./node_modules COPY --from=builder --chown=lecoffreuser leCoffre-front/node_modules ./node_modules
COPY --from=builder --chown=lecoffreuser leCoffre-front/.next ./.next COPY --from=builder --chown=lecoffreuser leCoffre-front/.next ./.next
COPY --from=builder --chown=lecoffreuser leCoffre-front/package.json ./package.json COPY --from=builder --chown=lecoffreuser leCoffre-front/package.json ./package.json

25
src/pages/_app.tsx
View File

@ -66,19 +66,20 @@ const MyApp = (({
MyApp.getInitialProps = async () => { MyApp.getInitialProps = async () => {
console.log("runtime config", publicRuntimeConfig); console.log("runtime config", publicRuntimeConfig);
console.log("server runtime config", serverRuntimeConfig); console.log("server runtime config", serverRuntimeConfig);
console.log("process env", process.env['NEXT_PUBLIC_BACK_API_PROTOCOL'] || "env undefined");
return { return {
backApiProtocol: serverRuntimeConfig.NEXT_PUBLIC_BACK_API_PROTOCOL, backApiProtocol: publicRuntimeConfig.NEXT_PUBLIC_BACK_API_PROTOCOL,
backApiHost: serverRuntimeConfig.NEXT_PUBLIC_BACK_API_HOST, backApiHost: publicRuntimeConfig.NEXT_PUBLIC_BACK_API_HOST,
backApiRootUrl: serverRuntimeConfig.NEXT_PUBLIC_BACK_API_ROOT_URL, backApiRootUrl: publicRuntimeConfig.NEXT_PUBLIC_BACK_API_ROOT_URL,
backApiVersion: serverRuntimeConfig.NEXT_PUBLIC_BACK_API_VERSION, backApiVersion: publicRuntimeConfig.NEXT_PUBLIC_BACK_API_VERSION,
frontAppHost: serverRuntimeConfig.NEXT_PUBLIC_FRONT_APP_HOST, frontAppHost: publicRuntimeConfig.NEXT_PUBLIC_FRONT_APP_HOST,
frontAppPort: serverRuntimeConfig.NEXT_PUBLIC_FRONT_APP_PORT, frontAppPort: publicRuntimeConfig.NEXT_PUBLIC_FRONT_APP_PORT,
idNotBaseUrl: serverRuntimeConfig.NEXT_PUBLIC_IDNOT_BASE_URL, idNotBaseUrl: publicRuntimeConfig.NEXT_PUBLIC_IDNOT_BASE_URL,
idNotAuthorizeEndpoint: serverRuntimeConfig.NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT, idNotAuthorizeEndpoint: publicRuntimeConfig.NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT,
idNotClientId: serverRuntimeConfig.NEXT_PUBLIC_IDNOT_CLIENT_ID, idNotClientId: publicRuntimeConfig.NEXT_PUBLIC_IDNOT_CLIENT_ID,
fcAuthorizeEndpoint: serverRuntimeConfig.NEXT_PUBLIC_FC_AUTHORIZE_ENDPOINT, fcAuthorizeEndpoint: publicRuntimeConfig.NEXT_PUBLIC_FC_AUTHORIZE_ENDPOINT,
fcClientId: serverRuntimeConfig.NEXT_PUBLIC_FC_CLIENT_ID, fcClientId: publicRuntimeConfig.NEXT_PUBLIC_FC_CLIENT_ID,
docaposteApiUrl: serverRuntimeConfig.NEXT_PUBLIC_DOCAPOST_API_URL, docaposteApiUrl: publicRuntimeConfig.NEXT_PUBLIC_DOCAPOST_API_URL,
}; };
}; };