diff --git a/backend/src/server.ts b/backend/src/server.ts index e9677ea..746e955 100644 --- a/backend/src/server.ts +++ b/backend/src/server.ts @@ -171,19 +171,19 @@ app.get('/api/auth/config', (_req,res)=>{ }); }); -const port = Number(process.env.PORT||8080); -app.listen(port, ()=> log.info({ - port, - oidc: { issuer: oidcCfg.issuer, redirect: oidcCfg.redirectUri, provider: oidcCfg.providerName } -}, 'listening')); -}); - -const port = Number(process.env.PORT||8080); -app.listen(port, ()=> { +const port = Number(process.env.PORT || 8080); +app.listen(port, () => { log.info({ + port, oidc: { issuer: oidcCfg.issuer, redirect: oidcCfg.redirectUri, + provider: oidcCfg.providerName + } + }, 'listening'); +}); + +export default app; provider: oidcCfg.providerName, clientIdLen: oidcCfg.clientId.length }, diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 0507981..3406529 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -5,16 +5,16 @@ RUN if [ -f package-lock.json ]; then npm ci; else npm install; fi && npm instal COPY index.html vite.config.ts tsconfig.json ./ COPY src ./src ARG VITE_API_BASE -ARG OIDC_PROVIDER ARG VITE_OIDC_PROVIDER ARG VITE_BING_MKT ARG VITE_BING_DISABLE ENV VITE_API_BASE=$VITE_API_BASE -ENV OIDC_PROVIDER=$OIDC_PROVIDER -ENV VITE_OIDC_PROVIDER=${VITE_OIDC_PROVIDER:-$OIDC_PROVIDER} +ENV VITE_OIDC_PROVIDER=$VITE_OIDC_PROVIDER ENV VITE_BING_MKT=$VITE_BING_MKT ENV VITE_BING_DISABLE=$VITE_BING_DISABLE RUN npm run build FROM nginx:1.27-alpine COPY --from=build /app/dist /usr/share/nginx/html +FROM nginx:1.27-alpine +COPY --from=build /app/dist /usr/share/nginx/html