Decouple blog content from image build

This commit is contained in:
Haitai Pan 2025-12-23 13:07:13 +08:00 committed by Haitao Pan
parent e25744e248
commit 122b82a5ab
2 changed files with 20 additions and 23 deletions

View File

@ -105,25 +105,10 @@ jobs:
- uses: docker/setup-buildx-action@v3
# -------------------------------------------------------------
# Prepare knowledge content for Docker build (avoid git clone in Dockerfile)
# Checkout knowledge content for runtime mount
# -------------------------------------------------------------
- name: Checkout knowledge content
uses: actions/checkout@v4
with:
repository: Cloud-Neutral-Workshop/knowledge
path: .tmp/knowledge
token: ${{ secrets.KNOWLEDGE_REPO_TOKEN || github.token }}
- name: Sync knowledge content into build context
run: |
set -euo pipefail
rm -rf src/content/blog/*
cp -R .tmp/knowledge/content/* src/content/blog/
- name: Create CI Dockerfile without knowledge clone
run: |
set -euo pipefail
perl -0777 -pe 's#RUN git clone https://github.com/Cloud-Neutral-Workshop/knowledge.git /tmp/knowledge\\\n && rm -rf src/content/blog/\\*\\\n && cp -R /tmp/knowledge/content/\\* src/content/blog/\\\n && rm -rf /tmp/knowledge#RUN echo "knowledge content provided by CI"#' Dockerfile > Dockerfile.ci
- name: Clone knowledge content
run: git clone https://github.com/Cloud-Neutral-Workshop/knowledge.git knowledge
# -------------------------------------------------------------
# Build service image
@ -133,7 +118,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: ${{ matrix.service.workdir }}
file: ${{ matrix.service.dockerfile == 'Dockerfile' && 'Dockerfile.ci' || matrix.service.dockerfile }}
file: ${{ matrix.service.dockerfile }}
platforms: linux/amd64,linux/arm64
push: ${{ env.PUSH_IMAGES == 'true' || env.PUSH_IMAGES == true }}
tags: ${{ steps.meta.outputs.tags }}
@ -143,6 +128,20 @@ jobs:
NODE_BUILDER_IMAGE=${{ env.NODE_BUILDER_IMAGE }}
NODE_RUNTIME_IMAGE=${{ env.NODE_RUNTIME_IMAGE }}
# -------------------------------------------------------------
# Validate runtime mount for blog content
# -------------------------------------------------------------
- name: Validate blog content mount
if: env.PUSH_IMAGES == 'true'
run: |
set -euo pipefail
IMAGE="${{ env.REGISTRY }}/${{ env.ORG }}/${{ matrix.service.name }}@${{ steps.build.outputs.digest }}"
docker pull "$IMAGE"
docker run --rm \
-v "${{ github.workspace }}/knowledge/content:/app/dashboard/src/content/blog:ro" \
"$IMAGE" \
sh -c 'test -d /app/dashboard/src/content/blog'
# -------------------------------------------------------------
# Push to Docker Hub (optional)
# -------------------------------------------------------------

View File

@ -25,10 +25,8 @@ RUN apt-get update \
&& corepack prepare yarn@4.12.0 --activate
COPY . .
RUN git clone https://github.com/Cloud-Neutral-Workshop/knowledge.git /tmp/knowledge \
&& rm -rf src/content/blog/* \
&& cp -R /tmp/knowledge/content/* src/content/blog/ \
&& rm -rf /tmp/knowledge
RUN rm -rf src/content/blog/* \
&& mkdir -p src/content/blog
RUN find . -name "package-lock.json" -delete
RUN yarn install --immutable
RUN yarn next build