chore: align with clean @mintel basis v1.7.10 and modernize deployment
Some checks failed
Some checks failed
This commit is contained in:
@@ -219,6 +219,7 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
env:
|
env:
|
||||||
TRAEFIK_RULE: ${{ needs.prepare.outputs.traefik_rule }}
|
TRAEFIK_RULE: ${{ needs.prepare.outputs.traefik_rule }}
|
||||||
|
ENV_FILE: ${{ needs.prepare.outputs.env_file }}
|
||||||
run: |
|
run: |
|
||||||
# Generate Environment File
|
# Generate Environment File
|
||||||
LOG_LEVEL=$( [[ "$TARGET" == "testing" || "$TARGET" == "development" ]] && echo "debug" || echo "info" )
|
LOG_LEVEL=$( [[ "$TARGET" == "testing" || "$TARGET" == "development" ]] && echo "debug" || echo "info" )
|
||||||
@@ -247,6 +248,9 @@ jobs:
|
|||||||
DIRECTUS_DB_NAME=$DIRECTUS_DB_NAME
|
DIRECTUS_DB_NAME=$DIRECTUS_DB_NAME
|
||||||
DIRECTUS_DB_USER=$DIRECTUS_DB_USER
|
DIRECTUS_DB_USER=$DIRECTUS_DB_USER
|
||||||
DIRECTUS_DB_PASSWORD=$DIRECTUS_DB_PASSWORD
|
DIRECTUS_DB_PASSWORD=$DIRECTUS_DB_PASSWORD
|
||||||
|
DIRECTUS_DB_CLIENT=pg
|
||||||
|
DIRECTUS_DB_HOST=directus-db
|
||||||
|
DIRECTUS_DB_PORT=5432
|
||||||
DIRECTUS_API_TOKEN=$DIRECTUS_API_TOKEN
|
DIRECTUS_API_TOKEN=$DIRECTUS_API_TOKEN
|
||||||
INTERNAL_DIRECTUS_URL=http://directus:8055
|
INTERNAL_DIRECTUS_URL=http://directus:8055
|
||||||
|
|
||||||
@@ -259,6 +263,7 @@ jobs:
|
|||||||
SENTRY_ENVIRONMENT=$TARGET
|
SENTRY_ENVIRONMENT=$TARGET
|
||||||
PROJECT_NAME=$PROJECT_NAME
|
PROJECT_NAME=$PROJECT_NAME
|
||||||
TRAEFIK_HOST_RULE='$TRAEFIK_RULE'
|
TRAEFIK_HOST_RULE='$TRAEFIK_RULE'
|
||||||
|
ENV_FILE=$ENV_FILE
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# AUTH_MIDDLEWARE logic
|
# AUTH_MIDDLEWARE logic
|
||||||
|
|||||||
23
Dockerfile
23
Dockerfile
@@ -1,10 +1,7 @@
|
|||||||
# Stage 1: Builder
|
# Stage 1: Builder
|
||||||
FROM node:20-alpine AS builder
|
FROM registry.infra.mintel.me/mintel/nextjs:1.7.10 AS builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Clean the workspace
|
|
||||||
RUN rm -rf ./*
|
|
||||||
|
|
||||||
# Arguments for build-time configuration
|
# Arguments for build-time configuration
|
||||||
ARG NEXT_PUBLIC_BASE_URL
|
ARG NEXT_PUBLIC_BASE_URL
|
||||||
ARG NEXT_PUBLIC_TARGET
|
ARG NEXT_PUBLIC_TARGET
|
||||||
@@ -18,9 +15,6 @@ ENV DIRECTUS_URL=$DIRECTUS_URL
|
|||||||
ENV SKIP_RUNTIME_ENV_VALIDATION=true
|
ENV SKIP_RUNTIME_ENV_VALIDATION=true
|
||||||
ENV CI=true
|
ENV CI=true
|
||||||
|
|
||||||
# Enable pnpm v10
|
|
||||||
RUN corepack enable && corepack prepare pnpm@10.3.0 --activate
|
|
||||||
|
|
||||||
# Copy lockfile and manifest for dependency installation caching
|
# Copy lockfile and manifest for dependency installation caching
|
||||||
COPY pnpm-lock.yaml package.json .npmrc* ./
|
COPY pnpm-lock.yaml package.json .npmrc* ./
|
||||||
|
|
||||||
@@ -40,16 +34,13 @@ COPY . .
|
|||||||
RUN pnpm build
|
RUN pnpm build
|
||||||
|
|
||||||
# Stage 2: Runner
|
# Stage 2: Runner
|
||||||
FROM node:20-alpine AS runner
|
FROM registry.infra.mintel.me/mintel/runtime:1.7.10 AS runner
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Install curl for health checks
|
# Create nextjs user and group (standardized in runtime image but ensuring local ownership)
|
||||||
RUN apk add --no-cache curl
|
USER root
|
||||||
|
RUN chown -R nextjs:nodejs /app
|
||||||
# Create nextjs user and group
|
USER nextjs
|
||||||
RUN addgroup --system --gid 1001 nodejs && \
|
|
||||||
adduser --system --uid 1001 nextjs && \
|
|
||||||
chown nextjs:nodejs /app
|
|
||||||
|
|
||||||
ENV HOSTNAME="0.0.0.0"
|
ENV HOSTNAME="0.0.0.0"
|
||||||
ENV PORT=3000
|
ENV PORT=3000
|
||||||
@@ -61,6 +52,4 @@ COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
|
|||||||
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
|
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
|
||||||
COPY --from=builder --chown=nextjs:nodejs /app/.next/cache ./.next/cache
|
COPY --from=builder --chown=nextjs:nodejs /app/.next/cache ./.next/cache
|
||||||
|
|
||||||
USER nextjs
|
|
||||||
|
|
||||||
CMD ["node", "server.js"]
|
CMD ["node", "server.js"]
|
||||||
|
|||||||
10
package.json
10
package.json
@@ -4,9 +4,9 @@
|
|||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@directus/sdk": "^21.0.0",
|
"@directus/sdk": "^21.0.0",
|
||||||
"@mintel/mail": "^1.6.0",
|
"@mintel/mail": "^1.7.10",
|
||||||
"@mintel/next-config": "^1.6.0",
|
"@mintel/next-config": "^1.7.10",
|
||||||
"@mintel/next-feedback": "^1.6.0",
|
"@mintel/next-feedback": "^1.7.10",
|
||||||
"@mintel/next-utils": "^1.7.15",
|
"@mintel/next-utils": "^1.7.15",
|
||||||
"@react-email/components": "^1.0.7",
|
"@react-email/components": "^1.0.7",
|
||||||
"@react-pdf/renderer": "^4.3.2",
|
"@react-pdf/renderer": "^4.3.2",
|
||||||
@@ -45,8 +45,8 @@
|
|||||||
"@commitlint/cli": "^20.4.0",
|
"@commitlint/cli": "^20.4.0",
|
||||||
"@commitlint/config-conventional": "^20.4.0",
|
"@commitlint/config-conventional": "^20.4.0",
|
||||||
"@lhci/cli": "^0.15.1",
|
"@lhci/cli": "^0.15.1",
|
||||||
"@mintel/eslint-config": "^1.6.0",
|
"@mintel/eslint-config": "^1.7.10",
|
||||||
"@mintel/tsconfig": "^1.6.0",
|
"@mintel/tsconfig": "^1.7.10",
|
||||||
"@tailwindcss/cli": "^4.1.18",
|
"@tailwindcss/cli": "^4.1.18",
|
||||||
"@tailwindcss/postcss": "^4.1.18",
|
"@tailwindcss/postcss": "^4.1.18",
|
||||||
"@types/geojson": "^7946.0.16",
|
"@types/geojson": "^7946.0.16",
|
||||||
|
|||||||
Reference in New Issue
Block a user