diff --git a/Dockerfile b/Dockerfile index 95e815c48..0149ddea4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,27 @@ +FROM node:18-alpine as builder + +WORKDIR /app + +COPY assets ./assets +COPY node_modules ./node_modules +COPY build_n_deploy ./build_n_deploy +COPY node_dist ./node_dist +COPY frontend_production ./frontend_production +COPY package.json . + FROM gcr.io/distroless/nodejs:18 WORKDIR /var/server -ADD assets ./assets -ADD node_modules ./node_modules -ADD build_n_deploy ./build_n_deploy -ADD node_dist ./node_dist -ADD frontend_production ./frontend_production -ADD package.json . +COPY --from=builder /app/assets ./assets +COPY --from=builder /app/node_modules ./node_modules +COPY --from=builder /app/build_n_deploy ./build_n_deploy +COPY --from=builder /app/node_dist ./node_dist +COPY --from=builder /app/frontend_production ./frontend_production +COPY --from=builder /app/package.json . ENV NODE_ENV production EXPOSE 8000 -CMD ["--es-module-specifier-resolution=node", "node_dist/backend/server.js"] + +CMD ["--es-module-specifier-resolution=node", "node_dist/backend/server.js"] \ No newline at end of file diff --git "a/src/frontend/Komponenter/Behandling/VedtakOgBeregning/Overgangsst\303\270nad/Felles/f\303\270dselsdatoUtils.ts" "b/src/frontend/Komponenter/Behandling/VedtakOgBeregning/Overgangsst\303\270nad/Felles/f\303\270dselsdatoUtils.ts" index 2441b65c4..9d8bf67fc 100644 --- "a/src/frontend/Komponenter/Behandling/VedtakOgBeregning/Overgangsst\303\270nad/Felles/f\303\270dselsdatoUtils.ts" +++ "b/src/frontend/Komponenter/Behandling/VedtakOgBeregning/Overgangsst\303\270nad/Felles/f\303\270dselsdatoUtils.ts" @@ -27,10 +27,12 @@ export const utledYngsteBarnFødselsdatoSomHarInngangsvilkåretAleneomsorgOppfyl .map((b) => b?.registergrunnlag.fødselsdato) .filter((fødselsdato): fødselsdato is string => !!fødselsdato && erGyldigDato(fødselsdato)) .concat(terminbarnFødselsdatoer); + if (datoer.length === 0) { return undefined; } + return datoer.reduce((a, b) => { return erEtter(a, b) ? a : b; - }); + }, datoer[0]); };