Compare commits

...

4 Commits

Author SHA1 Message Date
GitHub Actions
72ebde31ce fix: add pull:true to security rebuild to fetch fresh base images
Without pull:true, the weekly security rebuild may use stale base
images cached on GitHub runners, missing security patches like
c-ares 1.34.6-r0 (CVE-2025-62408).
2025-12-14 05:21:15 +00:00
GitHub Actions
7c79bf066a fix: update security package check to include apk update for accurate version info 2025-12-14 05:12:01 +00:00
GitHub Actions
394ada14f3 fix: update Docker run command to remove entrypoint for security package checks 2025-12-14 04:36:39 +00:00
GitHub Actions
9384c9c81f fix: build CrowdSec from source to address stdlib vulnerabilities and ensure compatibility with Go 1.25.5+ 2025-12-14 04:04:01 +00:00
2 changed files with 62 additions and 24 deletions

View File

@@ -71,6 +71,7 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
no-cache: ${{ github.event_name == 'schedule' || inputs.force_rebuild }}
pull: true # Always pull fresh base images to get latest security patches
build-args: |
VERSION=security-scan
BUILD_DATE=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
@@ -121,8 +122,8 @@ jobs:
echo "" >> $GITHUB_STEP_SUMMARY
echo "Checking key security packages:" >> $GITHUB_STEP_SUMMARY
echo '```' >> $GITHUB_STEP_SUMMARY
docker run --rm ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build.outputs.digest }} \
sh -c "apk info c-ares curl libcurl openssl" >> $GITHUB_STEP_SUMMARY
docker run --rm --entrypoint "" ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build.outputs.digest }} \
sh -c "apk update >/dev/null 2>&1 && apk info c-ares curl libcurl openssl" >> $GITHUB_STEP_SUMMARY
echo '```' >> $GITHUB_STEP_SUMMARY
- name: Create security scan summary

View File

@@ -158,11 +158,52 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
rm -rf /tmp/buildenv_* /tmp/caddy-temp; \
/usr/bin/caddy version'
# ---- CrowdSec Installer ----
# CrowdSec requires CGO (mattn/go-sqlite3), so we cannot build from source
# with CGO_ENABLED=0. Instead, we download prebuilt static binaries for amd64
# or install from packages. For other architectures, CrowdSec is skipped.
FROM alpine:3.23 AS crowdsec-installer
# ---- CrowdSec Builder ----
# Build CrowdSec from source to ensure we use Go 1.25.5+ and avoid stdlib vulnerabilities
# (CVE-2025-58183, CVE-2025-58186, CVE-2025-58187, CVE-2025-61729)
FROM --platform=$BUILDPLATFORM golang:1.25-alpine AS crowdsec-builder
COPY --from=xx / /
WORKDIR /tmp/crowdsec
ARG TARGETPLATFORM
ARG TARGETOS
ARG TARGETARCH
# CrowdSec version - Renovate can update this
# renovate: datasource=github-releases depName=crowdsecurity/crowdsec
ARG CROWDSEC_VERSION=1.7.4
# hadolint ignore=DL3018
RUN apk add --no-cache git clang lld
# hadolint ignore=DL3018,DL3059
RUN xx-apk add --no-cache gcc musl-dev
# Clone CrowdSec source
RUN git clone --depth 1 --branch "v${CROWDSEC_VERSION}" https://github.com/crowdsecurity/crowdsec.git .
# Build CrowdSec binaries for target architecture
# hadolint ignore=DL3059
RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg/mod \
CGO_ENABLED=1 xx-go build -o /crowdsec-out/crowdsec \
-ldflags "-s -w -X github.com/crowdsecurity/crowdsec/pkg/cwversion.Version=v${CROWDSEC_VERSION}" \
./cmd/crowdsec && \
xx-verify /crowdsec-out/crowdsec
# hadolint ignore=DL3059
RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/go/pkg/mod \
CGO_ENABLED=1 xx-go build -o /crowdsec-out/cscli \
-ldflags "-s -w -X github.com/crowdsecurity/crowdsec/pkg/cwversion.Version=v${CROWDSEC_VERSION}" \
./cmd/crowdsec-cli && \
xx-verify /crowdsec-out/cscli
# Copy config files
RUN mkdir -p /crowdsec-out/config && \
cp -r config/* /crowdsec-out/config/ || true
# ---- CrowdSec Fallback (for architectures where build fails) ----
FROM alpine:3.23 AS crowdsec-fallback
WORKDIR /tmp/crowdsec
@@ -174,32 +215,27 @@ ARG CROWDSEC_VERSION=1.7.4
# hadolint ignore=DL3018
RUN apk add --no-cache curl tar
# Download static binaries (only available for amd64)
# Download static binaries as fallback (only available for amd64)
# For other architectures, create empty placeholder files so COPY doesn't fail
# hadolint ignore=DL3059,SC2015
RUN set -eux; \
mkdir -p /crowdsec-out/bin /crowdsec-out/config; \
if [ "$TARGETARCH" = "amd64" ]; then \
echo "Downloading CrowdSec binaries for amd64..."; \
echo "Downloading CrowdSec binaries for amd64 (fallback)..."; \
curl -fSL "https://github.com/crowdsecurity/crowdsec/releases/download/v${CROWDSEC_VERSION}/crowdsec-release.tgz" \
-o /tmp/crowdsec.tar.gz && \
tar -xzf /tmp/crowdsec.tar.gz -C /tmp && \
# Binaries are in cmd/crowdsec-cli/cscli and cmd/crowdsec/crowdsec
cp "/tmp/crowdsec-v${CROWDSEC_VERSION}/cmd/crowdsec-cli/cscli" /crowdsec-out/bin/ && \
cp "/tmp/crowdsec-v${CROWDSEC_VERSION}/cmd/crowdsec/crowdsec" /crowdsec-out/bin/ && \
chmod +x /crowdsec-out/bin/* && \
# Copy config files from the release tarball
if [ -d "/tmp/crowdsec-v${CROWDSEC_VERSION}/config" ]; then \
cp -r "/tmp/crowdsec-v${CROWDSEC_VERSION}/config/"* /crowdsec-out/config/; \
fi && \
echo "CrowdSec binaries installed successfully"; \
echo "CrowdSec fallback binaries installed successfully"; \
else \
echo "CrowdSec binaries not available for $TARGETARCH - skipping"; \
# Create empty placeholder so COPY doesn't fail
touch /crowdsec-out/bin/.placeholder /crowdsec-out/config/.placeholder; \
fi; \
# Show what we have
ls -la /crowdsec-out/bin/ /crowdsec-out/config/ || true
fi
# ---- Final Runtime with Caddy ----
FROM ${CADDY_IMAGE}
@@ -220,18 +256,19 @@ RUN mkdir -p /app/data/geoip && \
# Copy Caddy binary from caddy-builder (overwriting the one from base image)
COPY --from=caddy-builder /usr/bin/caddy /usr/bin/caddy
# Copy CrowdSec binaries from the crowdsec-installer stage (optional - only amd64)
# The installer creates placeholders for non-amd64 architectures
COPY --from=crowdsec-installer /crowdsec-out/bin/* /usr/local/bin/
COPY --from=crowdsec-installer /crowdsec-out/config /etc/crowdsec.dist
# Copy CrowdSec binaries from the crowdsec-builder stage (built with Go 1.25.5+)
# This ensures we don't have stdlib vulnerabilities from older Go versions
COPY --from=crowdsec-builder /crowdsec-out/crowdsec /usr/local/bin/crowdsec
COPY --from=crowdsec-builder /crowdsec-out/cscli /usr/local/bin/cscli
COPY --from=crowdsec-builder /crowdsec-out/config /etc/crowdsec.dist
# Clean up placeholder files and verify CrowdSec (if available)
RUN rm -f /usr/local/bin/.placeholder /etc/crowdsec.dist/.placeholder 2>/dev/null || true; \
# Verify CrowdSec binaries
RUN chmod +x /usr/local/bin/crowdsec /usr/local/bin/cscli 2>/dev/null || true; \
if [ -x /usr/local/bin/cscli ]; then \
echo "CrowdSec installed:"; \
echo "CrowdSec installed (built from source with Go 1.25):"; \
cscli version || echo "CrowdSec version check failed"; \
else \
echo "CrowdSec not available for this architecture - skipping verification"; \
echo "CrowdSec not available for this architecture"; \
fi
# Create required CrowdSec directories in runtime image