Build optimizations implemented:
1. Makefile: Remove --no-cache flag
- Docker builds now use layer cache (incremental builds)
- Added DOCKER_BUILDKIT=1 for better performance
- Added buildx support for parallel builds
- New targets: docker-build-dev-no-test, package-rpm-sequential
2. Dockerfile: Add SKIP_TESTS argument
- SKIP_TESTS=true for faster production builds
- Tests still run in CI by default
- Added BuildKit cache mounts for:
- /go/pkg/mod (Go modules)
- /var/cache/apt (APT cache)
- /var/lib/apt/lists (APT lists)
3. Dockerfile.package: Factorize common RPM tools
- New stage: rpm-common-tools (shared across el8/el9/el10)
- fpm installed once, reused 3 times
- Common build script: /build-rpm.sh
- Reduced duplication from 300 lines to 60 lines per stage
4. Parallel RPM builds with buildx
- make package-rpm now uses buildx for parallel builds
- el8, el9, el10 built simultaneously
- Fallback: make package-rpm-sequential (if buildx fails)
Expected performance gains:
- Incremental build (code change only): 15-25 min → 3-5 min (-80%)
- Full build (no cache): 15-25 min → 8-12 min (-50%)
- RPM builds (parallel): 9 min → 4 min (-55%)
- Total typical workflow: ~20 min → ~5-7 min (-65%)
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
141 lines
4.8 KiB
Docker
141 lines
4.8 KiB
Docker
# syntax=docker/dockerfile:1
|
|
|
|
# =============================================================================
|
|
# Builder stage - compile and test
|
|
# =============================================================================
|
|
FROM golang:1.21 AS builder
|
|
|
|
WORKDIR /build
|
|
|
|
# Install dependencies (optimized for caching)
|
|
RUN --mount=type=cache,target=/var/cache/apt \
|
|
--mount=type=cache,target=/var/lib/apt/lists \
|
|
apt-get update && apt-get install -y --no-install-recommends \
|
|
git \
|
|
bc \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
# Copy go mod files
|
|
COPY go.mod go.sum ./
|
|
|
|
# Download dependencies (cached layer)
|
|
RUN --mount=type=cache,target=/go/pkg/mod \
|
|
go mod download
|
|
|
|
# Copy source code (this layer changes frequently)
|
|
COPY . .
|
|
|
|
# ARG to skip tests (for faster builds)
|
|
ARG SKIP_TESTS=false
|
|
|
|
# Run tests with coverage (fail if < 80%) - can be skipped with SKIP_TESTS=true
|
|
RUN --mount=type=cache,target=/go/pkg/mod \
|
|
if [ "$SKIP_TESTS" = "false" ]; then \
|
|
go test -race -coverprofile=coverage.txt -covermode=atomic ./... && \
|
|
echo "=== Coverage Report ===" && \
|
|
go tool cover -func=coverage.txt | grep total && \
|
|
TOTAL=$(go tool cover -func=coverage.txt | grep total | awk '{gsub(/%/, "", $3); print $3}') && \
|
|
echo "Total coverage: ${TOTAL}%" && \
|
|
if (( $(echo "$TOTAL < 80" | bc -l) )); then \
|
|
echo "ERROR: Coverage ${TOTAL}% is below 80% threshold"; \
|
|
exit 1; \
|
|
fi && \
|
|
echo "Coverage check passed!"; \
|
|
else \
|
|
echo "Skipping tests (SKIP_TESTS=true)"; \
|
|
fi
|
|
|
|
# Build binary
|
|
RUN --mount=type=cache,target=/go/pkg/mod \
|
|
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \
|
|
-ldflags="-w -s" \
|
|
-o /usr/bin/logcorrelator \
|
|
./cmd/logcorrelator
|
|
|
|
# Create runtime root filesystem
|
|
RUN mkdir -p /tmp/runtime-root/var/log/logcorrelator /tmp/runtime-root/var/run/logcorrelator /tmp/runtime-root/etc/logcorrelator
|
|
|
|
# =============================================================================
|
|
# Runtime stage - minimal image for running the service
|
|
# =============================================================================
|
|
FROM scratch AS runtime
|
|
|
|
# Copy binary from builder
|
|
COPY --from=builder /usr/bin/logcorrelator /usr/bin/logcorrelator
|
|
|
|
# Copy example config
|
|
COPY --from=builder /build/config.example.yml /etc/logcorrelator/logcorrelator.yml
|
|
|
|
# Create necessary directories in builder stage (scratch image has no shell)
|
|
COPY --from=builder /tmp/runtime-root/var /var
|
|
COPY --from=builder /tmp/runtime-root/etc /etc
|
|
|
|
# Expose nothing (Unix sockets only)
|
|
# Health check not applicable for this service type
|
|
|
|
# Set entrypoint
|
|
ENTRYPOINT ["/usr/bin/logcorrelator"]
|
|
CMD ["-config", "/etc/logcorrelator/logcorrelator.yml"]
|
|
|
|
# =============================================================================
|
|
# RPM build stage - create .rpm package entirely in Docker
|
|
# =============================================================================
|
|
FROM ruby:3.2-bookworm AS rpm-builder
|
|
|
|
WORKDIR /build
|
|
|
|
# Install fpm and rpm tools
|
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
rpm \
|
|
&& rm -rf /var/lib/apt/lists/* \
|
|
&& gem install fpm -v 1.16.0
|
|
|
|
# Copy binary from builder stage
|
|
COPY --from=builder /usr/bin/logcorrelator /tmp/pkgroot/usr/bin/logcorrelator
|
|
|
|
# Copy config and systemd unit
|
|
COPY --from=builder /build/config.example.yml /tmp/pkgroot/etc/logcorrelator/logcorrelator.yml
|
|
COPY logcorrelator.service /tmp/pkgroot/etc/systemd/system/logcorrelator.service
|
|
|
|
# Create directory structure and set permissions
|
|
RUN mkdir -p /tmp/pkgroot/var/log/logcorrelator && \
|
|
mkdir -p /tmp/pkgroot/var/run/logcorrelator && \
|
|
chmod 755 /tmp/pkgroot/var/log/logcorrelator && \
|
|
chmod 755 /tmp/pkgroot/var/run/logcorrelator
|
|
|
|
# Build RPM
|
|
ARG VERSION=$(grep -m1 "^Version:" packaging/rpm/logcorrelator.spec | awk '{print $2}')
|
|
RUN fpm -s dir -t rpm \
|
|
-n logcorrelator \
|
|
-v ${VERSION} \
|
|
-C /tmp/pkgroot \
|
|
--prefix / \
|
|
--description "Log correlation service for HTTP and network events" \
|
|
--url "https://github.com/logcorrelator/logcorrelator" \
|
|
--license "MIT" \
|
|
--vendor "logcorrelator" \
|
|
-p /tmp/logcorrelator-${VERSION}.rpm \
|
|
usr/bin/logcorrelator \
|
|
etc/logcorrelator/logcorrelator.yml \
|
|
etc/systemd/system/logcorrelator.service \
|
|
var/log/logcorrelator \
|
|
var/run/logcorrelator
|
|
|
|
# =============================================================================
|
|
# Development stage - for local testing with hot reload
|
|
# =============================================================================
|
|
FROM golang:1.21 AS dev
|
|
|
|
WORKDIR /app
|
|
|
|
# Install air for hot reload (optional)
|
|
RUN go install github.com/air-verse/air@latest
|
|
|
|
COPY go.mod ./
|
|
RUN go mod download || true
|
|
|
|
COPY . .
|
|
|
|
# Default command: run with example config
|
|
CMD ["go", "run", "./cmd/logcorrelator", "-config", "config.example.yml"]
|