Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/cd_dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,10 @@ jobs:
- name: Build and Push Container
# NEXT_PUBLIC_ env variables have to be set during the build phase.
run: |-
export DATABASE_URL=${{secrets.DATABASE_URL}}
docker build \
--build-arg NEXT_PUBLIC_SITE_ROOT=${{secrets.NEXT_PUBLIC_SITE_ROOT}} \
--secret id=sec_database_url,env=DATABASE_URL \
-f Dockerfile \
-t "${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.SERVICE }}:${{ env.TAG }}" ./
docker push "${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.SERVICE }}:${{ env.TAG }}"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/cd_prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,11 @@ jobs:
- name: Build and Push Container
# NEXT_PUBLIC_ env variables have to be set during the build phase.
run: |-
export DATABASE_URL=${{secrets.DATABASE_URL}}
docker build \
--build-arg NEXT_PUBLIC_SITE_ROOT=${{secrets.NEXT_PUBLIC_SITE_ROOT}} \
--build-arg NEXT_PUBLIC_POSTHOG_KEY=${{secrets.NEXT_PUBLIC_POSTHOG_KEY}} \
--secret id=sec_database_url,env=DATABASE_URL \
-f Dockerfile \
-t "${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.SERVICE }}:${{ env.TAG }}" ./
docker push "${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.SERVICE }}:${{ env.TAG }}"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/cd_staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,10 @@ jobs:
- name: Build and Push Container
# NEXT_PUBLIC_ env variables have to be set during the build phase.
run: |-
export DATABASE_URL=${{secrets.DATABASE_URL}}
docker build \
--build-arg NEXT_PUBLIC_SITE_ROOT=${{secrets.NEXT_PUBLIC_SITE_ROOT}} \
--secret id=sec_database_url,env=DATABASE_URL \
-f Dockerfile \
-t "${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.SERVICE }}:${{ env.TAG }}" ./
docker push "${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.SERVICE }}:${{ env.TAG }}"
Expand Down
20 changes: 11 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
FROM node:20-bullseye as installer
FROM node:22-bullseye AS installer
WORKDIR /app
COPY prisma ./
COPY package.json package-lock.json ./
RUN npm install

FROM node:20-bullseye as builder
FROM node:22-bullseye AS builder
WORKDIR /app
COPY --from=installer /app/node_modules/ /app/node_modules
COPY . .
ENV NEXT_TELEMETRY_DISABLED 1
ENV NEXT_TELEMETRY_DISABLED=1

ARG NEXT_PUBLIC_POSTHOG_KEY
ENV NEXT_PUBLIC_POSTHOG_KEY=$NEXT_PUBLIC_POSTHOG_KEY
ARG NEXT_PUBLIC_SITE_ROOT
ENV NEXT_PUBLIC_SITE_ROOT=$NEXT_PUBLIC_SITE_ROOT

RUN npm run build
RUN --mount=type=secret,id=sec_database_url \
export DATABASE_URL=$(cat /run/secrets/sec_database_url) && \
npm run build

# Force node.js to use ipv4 first, over ipv6, by appending the following to server.js
RUN echo "const dns = require('node:dns');" >> ./.next/standalone/server.js \
&& echo "dns.setDefaultResultOrder('ipv4first');" >> ./.next/standalone/server.js

FROM node:20-bullseye as runner
FROM node:22-bullseye AS runner
WORKDIR /app

ENV NODE_ENV production
ENV NODE_ENV=production
RUN addgroup --system --gid 1001 nodejs
RUN adduser --system --uid 1001 nextjs

Expand All @@ -34,7 +36,7 @@ COPY --from=builder --chown=nextjs:nodejs /app/public ./public

USER nextjs
EXPOSE 3000
ENV PORT 3000
ENV HOSTNAME "0.0.0.0"
ENV PORT=3000
ENV HOSTNAME="0.0.0.0"

CMD node server.js
CMD ["node", "server.js"]
2 changes: 0 additions & 2 deletions app/symposia/courses/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ import { Suspense } from "react";

export const metadata = {};

export const dynamic = "force-dynamic";

export default async function CoursesPage() {
return (
<PageWrapper>
Expand Down
3 changes: 2 additions & 1 deletion cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"next.config.mjs",
".env",
".env.*",
"cspell.json"
"cspell.json",
"Dockerfile"
],
"dictionaryDefinitions": [],
"dictionaries": [],
Expand Down
Loading