🐛 fix: Simplify docker-push workflow using Attempt 2 approach

This commit is contained in:
2026-04-09 12:21:52 +02:00
parent e27ed5b6ca
commit 930e9ac159

View File

@@ -41,13 +41,7 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.PACKAGES_TOKEN }}
- name: Calculate dependency hash
id: calc_hash
run: |
# Calculate dependency hash (same method as build-cache job)
DEPS_HASH=$(sha256sum go.mod go.sum docker/Dockerfile.build | sha256sum | cut -d' ' -f1 | head -c 12)
echo "Dependency hash: $DEPS_HASH"
echo "deps_hash=$DEPS_HASH" >> $GITHUB_OUTPUT
- name: Restore Swagger Docs Cache
id: cache-swagger-restore
@@ -65,9 +59,10 @@ jobs:
if: steps.cache-swagger-restore.outputs.cache-hit != 'true'
run: >
docker run --rm
-v ${GITHUB_WORKSPACE}:/build
gitea.arcodange.lab/arcodange/dance-lessons-coach-build-cache:${{ steps.calc_hash.outputs.deps_hash }}
go generate ./pkg/server
-v ${GITHUB_WORKSPACE}:/workspace
-w /workspace
golang:1.26.1-alpine
sh -c "apk add git && go install github.com/swaggo/swag/cmd/swag@latest && go generate ./pkg/server"
- name: Save Swagger Docs Cache
if: steps.cache-swagger-restore.outputs.cache-hit != 'true'
@@ -85,61 +80,11 @@ jobs:
source VERSION
IMAGE_VERSION="$MAJOR.$MINOR.$PATCH${PRERELEASE:+-$PRERELEASE}"
# Use the calculated dependency hash and set it as environment variable
DEPS_HASH="${{ steps.calc_hash.outputs.deps_hash }}"
echo "Using dependency hash: $DEPS_HASH"
echo "DEPS_HASH=$DEPS_HASH" >> $GITHUB_ENV
TAGS="$IMAGE_VERSION latest ${{ github.sha }}"
echo "Building Docker image with tags: $TAGS"
# Build the production image using inline version with prebuilt cache image
# Fixed: Use $GITHUB_ENV variable in the inline Dockerfile
docker build -t dance-lessons-coach -f - --build-arg DEPS_HASH . <<EOF
# dance-lessons-coach Production Docker Image
# Inline Dockerfile using prebuilt cache image
# Use the build cache image as base
ARG DEPS_HASH
FROM gitea.arcodange.lab/arcodange/dance-lessons-coach-build-cache:${DEPS_HASH} AS builder
# Copy source code to the correct working directory
COPY . /workspace
# Set working directory and build the binary
WORKDIR /workspace
RUN go build -o dance-lessons-coach ./cmd/server
# Final minimal image
FROM alpine:3.18
WORKDIR /app
# Install minimal dependencies
RUN apk add --no-cache ca-certificates tzdata
# Copy binary from builder
COPY --from=builder /workspace/dance-lessons-coach /app/dance-lessons-coach
# Copy configuration
COPY config.yaml /app/config.yaml
# Set permissions
RUN chmod +x /app/dance-lessons-coach
# Set timezone
ENV TZ=UTC
# Expose port
EXPOSE 8080
# Health check
HEALTHCHECK --interval=30s --timeout=3s \
CMD wget -q --spider http://localhost:8080/api/health || exit 1
# Entry point
ENTRYPOINT ["/app/dance-lessons-coach"]
EOF
# Build using the standard Dockerfile (Attempt 2 - simplest approach)
docker build -t dance-lessons-coach -f docker/Dockerfile .
for TAG in $TAGS; do
IMAGE_NAME="${{ env.CI_REGISTRY }}/${{ env.GITEA_ORG }}/${{ env.GITEA_REPO }}:$TAG"