mmintel/at-mintel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: implement centralized Docker base-image strategy and automate registry pushes
All checks were successful
Monorepo Pipeline / 🧪 Quality Assurance (push) Successful in 2m33s
Details
Monorepo Pipeline / 🚀 Release (push) Has been skipped
Details
Monorepo Pipeline / 🐳 Build & Push Images (push) Has been skipped
Details

Browse Source
This commit is contained in:
Marc Mintel
2026-02-03 11:50:17 +01:00
parent 653deb7995
commit a8bc039c02
7 changed files with 187 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
.gitea/workflows/pipeline.yml
View File

@@ -80,3 +80,41 @@ jobs:
echo "🏷️ Tag detected [${{ github.ref_name }}], performing sync release..." echo "🏷️ Tag detected [${{ github.ref_name }}], performing sync release..."
pnpm sync-versions pnpm sync-versions
pnpm release:tag pnpm release:tag
build-images:
name: 🐳 Build & Push Images
needs: qa
if: startsWith(github.ref, 'refs/tags/v')
runs-on: docker
steps:
- name: Checkout
uses: actions/checkout@v4
- name: 🐳 Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: 🔐 Registry Login
run: |
echo "${{ secrets.REGISTRY_PASS }}" | docker login registry.infra.mintel.me -u "${{ secrets.REGISTRY_USER }}" --password-stdin
- name: 🏗️ Build & Push Nextjs Base
env:
TAG: ${{ github.ref_name }}
run: |
docker buildx build \
--platform linux/amd64,linux/arm64 \
-t registry.infra.mintel.me/mintel/nextjs:$TAG \
-t registry.infra.mintel.me/mintel/nextjs:latest \
-f packages/infra/docker/Dockerfile.nextjs \
--push .
- name: 🏗️ Build & Push Gatekeeper
env:
TAG: ${{ github.ref_name }}
run: |
docker buildx build \
--platform linux/amd64,linux/arm64 \
-t registry.infra.mintel.me/mintel/gatekeeper:$TAG \
-t registry.infra.mintel.me/mintel/gatekeeper:latest \
-f packages/infra/docker/Dockerfile.gatekeeper \
--push .

44
apps/sample-website/Dockerfile
View File

@@ -1,25 +1,8 @@
FROM node:20-alpine AS base # Start from the pre-built Nextjs Base image
FROM registry.infra.mintel.me/mintel/nextjs:latest AS builder
# Install dependencies only when needed
FROM base AS deps
RUN apk add --no-cache libc6-compat curl
WORKDIR /app WORKDIR /app
# Install dependencies based on the preferred package manager
COPY package.json package-lock.json* pnpm-lock.yaml* ./
RUN corepack enable pnpm && \
pnpm config set store-dir /root/.local/share/pnpm/store/v3 && \
pnpm i --frozen-lockfile
# Rebuild the source code only when needed
FROM base AS builder
WORKDIR /app
COPY --from=deps /app/node_modules ./node_modules
COPY . .
# Next.js collects completely anonymous telemetry data about general usage.
ENV NEXT_TELEMETRY_DISABLED=1
# Build-time environment variables for Next.js # Build-time environment variables for Next.js
ARG NEXT_PUBLIC_BASE_URL ARG NEXT_PUBLIC_BASE_URL
ARG NEXT_PUBLIC_UMAMI_WEBSITE_ID ARG NEXT_PUBLIC_UMAMI_WEBSITE_ID
@@ -33,11 +16,11 @@ ENV NEXT_PUBLIC_UMAMI_SCRIPT_URL=$NEXT_PUBLIC_UMAMI_SCRIPT_URL
ENV NEXT_PUBLIC_TARGET=$NEXT_PUBLIC_TARGET ENV NEXT_PUBLIC_TARGET=$NEXT_PUBLIC_TARGET
ENV DIRECTUS_URL=$DIRECTUS_URL ENV DIRECTUS_URL=$DIRECTUS_URL
# Build the application # Build the specific application
RUN corepack enable pnpm && pnpm run build RUN pnpm --filter sample-website build
# Production image, copy all the files and run next # Production runner image
FROM base AS runner FROM node:20-alpine AS runner
WORKDIR /app WORKDIR /app
# Install curl for health checks # Install curl for health checks
@@ -49,15 +32,15 @@ ENV NEXT_TELEMETRY_DISABLED=1
RUN addgroup --system --gid 1001 nodejs RUN addgroup --system --gid 1001 nodejs
RUN adduser --system --uid 1001 nextjs RUN adduser --system --uid 1001 nextjs
COPY --from=builder /app/public ./public COPY --from=builder /app/apps/sample-website/public ./apps/sample-website/public
# Set the correct permission for prerender cache # Set the correct permission for prerender cache
RUN mkdir .next RUN mkdir -p apps/sample-website/.next
RUN chown nextjs:nodejs .next RUN chown nextjs:nodejs apps/sample-website/.next
# Automatically leverage output traces to reduce image size # Copy standalone output and static files from the monorepo path
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./ COPY --from=builder --chown=nextjs:nodejs /app/apps/sample-website/.next/standalone ./
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static COPY --from=builder --chown=nextjs:nodejs /app/apps/sample-website/.next/static ./apps/sample-website/.next/static
USER nextjs USER nextjs
@@ -66,4 +49,5 @@ EXPOSE 3000
ENV PORT=3000 ENV PORT=3000
ENV HOSTNAME="0.0.0.0" ENV HOSTNAME="0.0.0.0"
CMD ["node", "server.js"] # server.js in monorepo standalone is created for each app
CMD ["node", "apps/sample-website/server.js"]

2
apps/sample-website/docker-compose.yml
View File

@@ -9,7 +9,7 @@ services:
NEXT_PUBLIC_UMAMI_SCRIPT_URL: ${NEXT_PUBLIC_UMAMI_SCRIPT_URL} NEXT_PUBLIC_UMAMI_SCRIPT_URL: ${NEXT_PUBLIC_UMAMI_SCRIPT_URL}
NEXT_PUBLIC_TARGET: ${TARGET:-development} NEXT_PUBLIC_TARGET: ${TARGET:-development}
DIRECTUS_URL: ${DIRECTUS_URL:-http://directus:8055} DIRECTUS_URL: ${DIRECTUS_URL:-http://directus:8055}
image: sample-website:latest image: registry.infra.mintel.me/mintel/sample-website:latest
container_name: sample-website-app container_name: sample-website-app
restart: always restart: always
networks: networks:

79
packages/cli/src/index.ts
View File

@@ -318,34 +318,56 @@ export default function Home() {
// Copy infra templates // Copy infra templates
const infraPath = path.resolve(__dirname, "../../infra"); const infraPath = path.resolve(__dirname, "../../infra");
if (await fs.pathExists(infraPath)) { if (await fs.pathExists(infraPath)) {
await fs.copy( // Setup Dockerfile from template
path.join(infraPath, "docker/Dockerfile.nextjs"), const templatePath = path.join(
path.join(fullPath, "Dockerfile"), infraPath,
"docker/Dockerfile.app-template",
); );
await fs.copy( if (await fs.pathExists(templatePath)) {
path.join(infraPath, "docker/docker-compose.template.yml"), let dockerfile = await fs.readFile(templatePath, "utf8");
path.join(fullPath, "docker-compose.yml"), dockerfile = dockerfile.replace(/\$\{APP_NAME:-app\}/g, projectName);
await fs.writeFile(path.join(fullPath, "Dockerfile"), dockerfile);
}
// Setup docker-compose from template
const composeTemplatePath = path.join(
infraPath,
"docker/docker-compose.template.yml",
); );
if (await fs.pathExists(composeTemplatePath)) {
let compose = await fs.readFile(composeTemplatePath, "utf8");
compose = compose.replace(/\$\{APP_NAME:-app\}/g, projectName);
compose = compose.replace(/\$\{PROJECT_NAME:-app\}/g, projectName);
await fs.writeFile(
path.join(fullPath, "docker-compose.yml"),
compose,
);
}
await fs.ensureDir(path.join(fullPath, ".gitea/workflows")); await fs.ensureDir(path.join(fullPath, ".gitea/workflows"));
await fs.copy( const deployActionPath = path.join(
path.join(infraPath, "gitea/deploy-action.yml"), infraPath,
path.join(fullPath, ".gitea/workflows/deploy.yml"), "gitea/deploy-action.yml",
); );
if (await fs.pathExists(deployActionPath)) {
await fs.copy(
deployActionPath,
path.join(fullPath, ".gitea/workflows/deploy.yml"),
);
}
}
// Create Directus structure // Create Directus structure
await fs.ensureDir(path.join(fullPath, "directus/uploads")); await fs.ensureDir(path.join(fullPath, "directus/uploads"));
await fs.ensureDir(path.join(fullPath, "directus/extensions")); await fs.ensureDir(path.join(fullPath, "directus/extensions"));
await fs.writeFile( await fs.writeFile(path.join(fullPath, "directus/uploads/.gitkeep"), "");
path.join(fullPath, "directus/uploads/.gitkeep"), await fs.writeFile(
"", path.join(fullPath, "directus/extensions/.gitkeep"),
); "",
await fs.writeFile( );
path.join(fullPath, "directus/extensions/.gitkeep"),
"",
);
// Create .env.example // Create .env.example
const envExample = `# Project const envExample = `# Project
PROJECT_NAME=${projectName} PROJECT_NAME=${projectName}
PROJECT_COLOR=#82ed20 PROJECT_COLOR=#82ed20
@@ -377,14 +399,13 @@ SENTRY_DSN=
NEXT_PUBLIC_UMAMI_WEBSITE_ID= NEXT_PUBLIC_UMAMI_WEBSITE_ID=
NEXT_PUBLIC_UMAMI_SCRIPT_URL=https://analytics.infra.mintel.me/script.js NEXT_PUBLIC_UMAMI_SCRIPT_URL=https://analytics.infra.mintel.me/script.js
`; `;
await fs.writeFile(path.join(fullPath, ".env.example"), envExample); await fs.writeFile(path.join(fullPath, ".env.example"), envExample);
// Copy premium templates (globals.css, lib/directus.ts, scripts/setup-directus.ts) // Copy premium templates (globals.css, lib/directus.ts, scripts/setup-directus.ts)
const templatePath = path.join(infraPath, "templates/website"); const templatePath = path.join(infraPath, "templates/website");
if (await fs.pathExists(templatePath)) { if (await fs.pathExists(templatePath)) {
console.log(chalk.blue("Applying premium templates...")); console.log(chalk.blue("Applying premium templates..."));
await fs.copy(templatePath, fullPath, { overwrite: true }); await fs.copy(templatePath, fullPath, { overwrite: true });
}
} }
console.log( console.log(

46
packages/infra/docker/Dockerfile.app-template Normal file
View File

@@ -0,0 +1,46 @@
# Start from the pre-built Nextjs Base image
FROM registry.infra.mintel.me/mintel/nextjs:latest AS builder
WORKDIR /app
# Build-time environment variables for Next.js
ARG NEXT_PUBLIC_BASE_URL
ARG NEXT_PUBLIC_UMAMI_WEBSITE_ID
ARG NEXT_PUBLIC_UMAMI_SCRIPT_URL
ARG NEXT_PUBLIC_TARGET
ARG DIRECTUS_URL
ENV NEXT_PUBLIC_BASE_URL=$NEXT_PUBLIC_BASE_URL
ENV NEXT_PUBLIC_UMAMI_WEBSITE_ID=$NEXT_PUBLIC_UMAMI_WEBSITE_ID
ENV NEXT_PUBLIC_UMAMI_SCRIPT_URL=$NEXT_PUBLIC_UMAMI_SCRIPT_URL
ENV NEXT_PUBLIC_TARGET=$NEXT_PUBLIC_TARGET
ENV DIRECTUS_URL=$DIRECTUS_URL
# Build the specific application
RUN pnpm --filter ${APP_NAME:-app} build
# Production runner image
FROM node:20-alpine AS runner
WORKDIR /app
# Install curl for health checks
RUN apk add --no-cache curl
ENV NODE_ENV=production
ENV NEXT_TELEMETRY_DISABLED=1
RUN addgroup --system --gid 1001 nodejs
RUN adduser --system --uid 1001 nextjs
# Copy standalone output and static files
# Note: The path depends on the app name
COPY --from=builder --chown=nextjs:nodejs /app/apps/${APP_NAME:-app}/public ./apps/${APP_NAME:-app}/public
COPY --from=builder --chown=nextjs:nodejs /app/apps/${APP_NAME:-app}/.next/standalone ./
COPY --from=builder --chown=nextjs:nodejs /app/apps/${APP_NAME:-app}/.next/static ./apps/${APP_NAME:-app}/.next/static
USER nextjs
EXPOSE 3000
ENV PORT=3000
ENV HOSTNAME="0.0.0.0"
CMD ["node", "apps/${APP_NAME:-app}/server.js"]

49
packages/infra/docker/Dockerfile.gatekeeper
View File

@@ -1,47 +1,42 @@
FROM node:20-alpine AS base FROM node:20-alpine AS base
# Install dependencies only when needed RUN apk add --no-cache libc6-compat curl
FROM base AS deps
RUN apk add --no-cache libc6-compat
WORKDIR /app WORKDIR /app
# Install dependencies # Enable pnpm
COPY package.json pnpm-lock.yaml* ./ RUN corepack enable pnpm
RUN corepack enable pnpm && pnpm i --frozen-lockfile
# Rebuild the source code only when needed # Install dependencies (using monorepo root context)
FROM base AS builder COPY pnpm-lock.yaml pnpm-workspace.yaml package.json .npmrc* ./
WORKDIR /app COPY packages/gatekeeper/package.json ./packages/gatekeeper/
COPY --from=deps /app/node_modules ./node_modules COPY packages/next-utils/package.json ./packages/next-utils/
COPY packages/tsconfig/package.json ./packages/tsconfig/
COPY packages/eslint-config/package.json ./packages/eslint-config/
COPY packages/next-config/package.json ./packages/next-config/
RUN --mount=type=cache,target=/root/.local/share/pnpm/store/v3 \
pnpm i --frozen-lockfile
# Copy source
COPY . . COPY . .
ENV NEXT_TELEMETRY_DISABLED=1 # Build Gatekeeper
RUN pnpm --filter @mintel/gatekeeper build
# Build the application # Runner
RUN corepack enable pnpm && pnpm run build
# Production image, copy all the files and run next
FROM base AS runner FROM base AS runner
WORKDIR /app WORKDIR /app
RUN apk add --no-cache curl
ENV NODE_ENV=production ENV NODE_ENV=production
ENV NEXT_TELEMETRY_DISABLED=1
RUN addgroup --system --gid 1001 nodejs RUN addgroup --system --gid 1001 nodejs
RUN adduser --system --uid 1001 nextjs RUN adduser --system --uid 1001 nextjs
# Automatically leverage output traces to reduce image size COPY --from=builder /app/packages/gatekeeper/public ./packages/gatekeeper/public
# https://nextjs.org/docs/advanced-features/output-file-tracing COPY --from=builder /app/packages/gatekeeper/.next/standalone ./
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./ COPY --from=builder /app/packages/gatekeeper/.next/static ./packages/gatekeeper/.next/static
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
USER nextjs USER nextjs
EXPOSE 3000 EXPOSE 3000
ENV PORT=3000 ENV PORT=3000
ENV HOSTNAME="0.0.0.0" ENV HOSTNAME="0.0.0.0"
CMD ["node", "server.js"] CMD ["node", "packages/gatekeeper/server.js"]

88
packages/infra/docker/Dockerfile.nextjs
View File

@@ -1,80 +1,24 @@
FROM node:20-alpine AS base FROM node:20-alpine AS base
# Install dependencies only when needed
FROM base AS deps
RUN apk add --no-cache libc6-compat curl RUN apk add --no-cache libc6-compat curl
WORKDIR /app WORKDIR /app
# Install dependencies based on the preferred package manager # Enable pnpm
COPY package.json package-lock.json* pnpm-lock.yaml* ./ RUN corepack enable pnpm
RUN if [ -f pnpm-lock.yaml ]; then \
corepack enable pnpm && \
pnpm config set store-dir /root/.local/share/pnpm/store/v3 && \
pnpm i --frozen-lockfile; \
elif [ -f package-lock.json ]; then \
npm ci; \
else \
npm i; \
fi
# Rebuild the source code only when needed # Copy root configurations
FROM base AS builder COPY pnpm-lock.yaml pnpm-workspace.yaml package.json .npmrc* ./
WORKDIR /app
COPY --from=deps /app/node_modules ./node_modules # Copy all package.json files to allow pnpm install to be cached
COPY packages/*/package.json ./packages/
COPY apps/*/package.json ./apps/
# Install dependencies for the entire monorepo
RUN --mount=type=cache,target=/root/.local/share/pnpm/store/v3 \
pnpm i --frozen-lockfile
# Copy the rest of the source code
COPY . . COPY . .
# Next.js collects completely anonymous telemetry data about general usage. # Post-install/Build shared packages if needed
ENV NEXT_TELEMETRY_DISABLED=1 RUN pnpm -r build --filter="./packages/*"
# Build-time environment variables for Next.js
ARG NEXT_PUBLIC_BASE_URL
ARG NEXT_PUBLIC_UMAMI_WEBSITE_ID
ARG NEXT_PUBLIC_UMAMI_SCRIPT_URL
ARG NEXT_PUBLIC_TARGET
ARG DIRECTUS_URL
ENV NEXT_PUBLIC_BASE_URL=$NEXT_PUBLIC_BASE_URL
ENV NEXT_PUBLIC_UMAMI_WEBSITE_ID=$NEXT_PUBLIC_UMAMI_WEBSITE_ID
ENV NEXT_PUBLIC_UMAMI_SCRIPT_URL=$NEXT_PUBLIC_UMAMI_SCRIPT_URL
ENV NEXT_PUBLIC_TARGET=$NEXT_PUBLIC_TARGET
ENV DIRECTUS_URL=$DIRECTUS_URL
# Build the application
RUN if [ -f pnpm-lock.yaml ]; then \
corepack enable pnpm && \
pnpm run build; \
else \
npm run build; \
fi
# Production image, copy all the files and run next
FROM base AS runner
WORKDIR /app
# Install curl for health checks
RUN apk add --no-cache curl
ENV NODE_ENV=production
ENV NEXT_TELEMETRY_DISABLED=1
RUN addgroup --system --gid 1001 nodejs
RUN adduser --system --uid 1001 nextjs
COPY --from=builder /app/public ./public
# Set the correct permission for prerender cache
RUN mkdir .next
RUN chown nextjs:nodejs .next
# Automatically leverage output traces to reduce image size
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
USER nextjs
EXPOSE 3000
ENV PORT=3000
ENV HOSTNAME="0.0.0.0"
CMD ["node", "server.js"]