Исправить уязвимость образов и восстановить развёртывание Crank #85

Merged
bsodfather merged 2 commits from fix/deploy-image-security-20261005 into main 2026-10-05 05:14:43 +00:00
4 changed files with 38 additions and 6 deletions

No files matched your search

+19 -6
View File
@@ -264,9 +264,18 @@ jobs:
- name: Build Community images
run: |
docker build -f apps/admin-api/Dockerfile -t crank/admin-api:ci .
docker build -f apps/mcp-server/Dockerfile -t crank/mcp-server:ci .
docker build -f apps/ui/Dockerfile -t crank/ui:ci .
docker build --pull --build-arg CRANK_SECURITY_REFRESH=${{ gitea.sha }} \
-f apps/admin-api/Dockerfile -t crank/admin-api:ci .
docker build --pull --build-arg CRANK_SECURITY_REFRESH=${{ gitea.sha }} \
-f apps/mcp-server/Dockerfile -t crank/mcp-server:ci .
docker build --pull -f apps/ui/Dockerfile -t crank/ui:ci .
- name: Scan Community images
run: |
scripts/scan-images.sh \
crank/admin-api:ci \
crank/mcp-server:ci \
crank/ui:ci
- name: Start Community image stack
run: |
@@ -395,15 +404,19 @@ jobs:
- name: Build and push images
run: |
docker build -f apps/admin-api/Dockerfile \
docker build --pull \
--build-arg CRANK_SECURITY_REFRESH=${{ env.IMAGE_TAG }} \
-f apps/admin-api/Dockerfile \
-t '${{ env.ADMIN_API_IMAGE }}:${{ env.IMAGE_TAG }}' \
-t '${{ env.ADMIN_API_IMAGE }}:main' \
.
docker build -f apps/mcp-server/Dockerfile \
docker build --pull \
--build-arg CRANK_SECURITY_REFRESH=${{ env.IMAGE_TAG }} \
-f apps/mcp-server/Dockerfile \
-t '${{ env.MCP_SERVER_IMAGE }}:${{ env.IMAGE_TAG }}' \
-t '${{ env.MCP_SERVER_IMAGE }}:main' \
.
docker build -f apps/ui/Dockerfile \
docker build --pull -f apps/ui/Dockerfile \
-t '${{ env.UI_IMAGE }}:${{ env.IMAGE_TAG }}' \
-t '${{ env.UI_IMAGE }}:main' \
.
+9
View File
@@ -17,8 +17,17 @@ RUN --mount=type=cache,id=crank-admin-cargo-registry,target=/usr/local/cargo/reg
FROM debian:bookworm-slim
ARG CRANK_SECURITY_REFRESH
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
RUN sed -i 's|http://deb.debian.org|https://deb.debian.org|g' /etc/apt/sources.list.d/debian.sources \
&& apt-get update \
&& apt-get install -y --no-install-recommends --only-upgrade libpcre2-8-0 \
&& rm -rf /var/lib/apt/lists/* \
&& dpkg --compare-versions "$(dpkg-query -W -f='${Version}' libpcre2-8-0)" ge '10.42-1+deb12u2' \
&& echo "crank-security-refresh=${CRANK_SECURITY_REFRESH}"
WORKDIR /app
COPY --from=builder /tmp/admin-api /usr/local/bin/admin-api
+9
View File
@@ -55,8 +55,17 @@ RUN --mount=type=cache,id=crank-mcp-cargo-registry,target=/usr/local/cargo/regis
FROM debian:bookworm-slim
ARG CRANK_SECURITY_REFRESH
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
RUN sed -i 's|http://deb.debian.org|https://deb.debian.org|g' /etc/apt/sources.list.d/debian.sources \
&& apt-get update \
&& apt-get install -y --no-install-recommends --only-upgrade libpcre2-8-0 \
&& rm -rf /var/lib/apt/lists/* \
&& dpkg --compare-versions "$(dpkg-query -W -f='${Version}' libpcre2-8-0)" ge '10.42-1+deb12u2' \
&& echo "crank-security-refresh=${CRANK_SECURITY_REFRESH}"
WORKDIR /app
COPY --from=builder /tmp/mcp-server /usr/local/bin/mcp-server
+1
View File
@@ -13,6 +13,7 @@ RUN npm run build
FROM nginx:1.30.4-alpine3.24-slim
RUN apk add --no-cache --upgrade \
'pcre2>=10.49-r0' \
'libcrypto3>=3.5.8-r0' \
'libssl3>=3.5.8-r0'