From dd678fa03211c3713526ec642a00b562f08b3b6b Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Fri, 26 Apr 2024 10:31:20 +0100 Subject: [PATCH] Update Dockerfiles --- apps/availability/Dockerfile | 10 +++++----- apps/frontend-example/Dockerfile | 10 +++++----- apps/infra/.gitignore | 2 +- apps/infra/README.md | 4 ++-- apps/meet/Dockerfile | 10 +++++----- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/apps/availability/Dockerfile b/apps/availability/Dockerfile index 2e51878..2b3ae32 100644 --- a/apps/availability/Dockerfile +++ b/apps/availability/Dockerfile @@ -1,4 +1,4 @@ -FROM node:lts-alpine@sha256:7e227295e96f5b00aa79555ae166f50610940d888fc2e321cf36304cbd17d7d6 AS base +FROM node:20-alpine@sha256:7a91aa397f2e2dfbfcdad2e2d72599f374e0b0172be1d86eeb73f1d33f36a4b2 AS base RUN apk update && apk add --no-cache dumb-init @@ -8,15 +8,15 @@ ENV NODE_ENV production ENV NEXT_TELEMETRY_DISABLED 1 # Set the correct permission for prerender cache -RUN mkdir .next -RUN chown node:node .next +RUN mkdir dist +RUN chown node:node dist ARG APP_NAME ENV APP_NAME=${APP_NAME} -COPY --chown=node:node .next/standalone ./ +COPY --chown=node:node dist/standalone ./ COPY --chown=node:node public ./apps/${APP_NAME}/public -COPY --chown=node:node .next/static ./apps/${APP_NAME}/dist/static +COPY --chown=node:node dist/static ./apps/${APP_NAME}/dist/static USER node diff --git a/apps/frontend-example/Dockerfile b/apps/frontend-example/Dockerfile index 2e51878..2b3ae32 100644 --- a/apps/frontend-example/Dockerfile +++ b/apps/frontend-example/Dockerfile @@ -1,4 +1,4 @@ -FROM node:lts-alpine@sha256:7e227295e96f5b00aa79555ae166f50610940d888fc2e321cf36304cbd17d7d6 AS base +FROM node:20-alpine@sha256:7a91aa397f2e2dfbfcdad2e2d72599f374e0b0172be1d86eeb73f1d33f36a4b2 AS base RUN apk update && apk add --no-cache dumb-init @@ -8,15 +8,15 @@ ENV NODE_ENV production ENV NEXT_TELEMETRY_DISABLED 1 # Set the correct permission for prerender cache -RUN mkdir .next -RUN chown node:node .next +RUN mkdir dist +RUN chown node:node dist ARG APP_NAME ENV APP_NAME=${APP_NAME} -COPY --chown=node:node .next/standalone ./ +COPY --chown=node:node dist/standalone ./ COPY --chown=node:node public ./apps/${APP_NAME}/public -COPY --chown=node:node .next/static ./apps/${APP_NAME}/dist/static +COPY --chown=node:node dist/static ./apps/${APP_NAME}/dist/static USER node diff --git a/apps/infra/.gitignore b/apps/infra/.gitignore index 1785d0a..a08c11e 100644 --- a/apps/infra/.gitignore +++ b/apps/infra/.gitignore @@ -1,2 +1,2 @@ passphrase.* -kubeconfig.json +kubeconfig.yaml diff --git a/apps/infra/README.md b/apps/infra/README.md index 714f404..236fc98 100644 --- a/apps/infra/README.md +++ b/apps/infra/README.md @@ -45,8 +45,8 @@ If you want to use your secret 'raw', import config from [config.ts](./src/confi ### Connecting with kubectl ```bash -PULUMI_CONFIG_PASSPHRASE_FILE=passphrase.prod.txt pulumi stack output --show-secrets k8sConfig > kubeconfig.json -export KUBECONFIG=$(pwd)/kubeconfig.json +PULUMI_CONFIG_PASSPHRASE_FILE=passphrase.prod.txt pulumi stack output --show-secrets k8sConfig > kubeconfig.yaml +export KUBECONFIG=$(pwd)/kubeconfig.yaml ``` ## Things we set up manually diff --git a/apps/meet/Dockerfile b/apps/meet/Dockerfile index 2e51878..2b3ae32 100644 --- a/apps/meet/Dockerfile +++ b/apps/meet/Dockerfile @@ -1,4 +1,4 @@ -FROM node:lts-alpine@sha256:7e227295e96f5b00aa79555ae166f50610940d888fc2e321cf36304cbd17d7d6 AS base +FROM node:20-alpine@sha256:7a91aa397f2e2dfbfcdad2e2d72599f374e0b0172be1d86eeb73f1d33f36a4b2 AS base RUN apk update && apk add --no-cache dumb-init @@ -8,15 +8,15 @@ ENV NODE_ENV production ENV NEXT_TELEMETRY_DISABLED 1 # Set the correct permission for prerender cache -RUN mkdir .next -RUN chown node:node .next +RUN mkdir dist +RUN chown node:node dist ARG APP_NAME ENV APP_NAME=${APP_NAME} -COPY --chown=node:node .next/standalone ./ +COPY --chown=node:node dist/standalone ./ COPY --chown=node:node public ./apps/${APP_NAME}/public -COPY --chown=node:node .next/static ./apps/${APP_NAME}/dist/static +COPY --chown=node:node dist/static ./apps/${APP_NAME}/dist/static USER node