ci/dc

Author: janmbaco

.github/workflows/integration-tests.yml

@@ -26,28 +26,7 @@ jobs:
       - name: Verify dependencies
         run: go mod verify
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Start test services
-        run: |
-          # Build and start the reverse proxy
-          docker build -f build/package/Dockerfile -t go-reverseproxy-ssl:test .
-          docker run -d --name reverse-proxy \
-            -p 443:443 \
-            -v ${{ github.workspace }}/integration/testdata:/app/test-html \
-            -v ${{ github.workspace }}/certs:/app/certs \
-            go-reverseproxy-ssl:test \
-            --config /app/integration/testdata/config.json
-
-          # Wait for services to be ready
-          timeout 30 bash -c 'until curl -k https://localhost/ > /dev/null 2>&1; do sleep 1; done'
-
-      - name: Run integration tests
-        run: INTEGRATION_TEST=true go test -v -race ./integration/...
-
-      - name: Stop services
-        if: always()
+      - name: Start test services and run integration tests
         run: |
-          docker stop reverse-proxy || true
-          docker rm reverse-proxy || true
+          chmod +x scripts/run-integration-tests.sh
+          ./scripts/run-integration-tests.sh

.github/workflows/version_go.yml

@@ -25,7 +25,7 @@ jobs:
         run: GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -v -o build/go-reverseproxy-ssl ./cmd/reverseproxy
 
       - name: Test
-        run: go test -v ./...
+        run: go test -v -race $(go list ./... | grep -v integration)
 
       - name: Log into docker hub
         uses: docker/login-action@v3

build/package/Dockerfile

@@ -14,11 +14,11 @@ COPY cmd/ cmd/
 COPY internal/ internal/
 
 # Descargar y verificar dependencias
-RUN go mod download
-RUN go mod tidy
-RUN go mod verify
+RUN go mod download || true
+RUN go mod tidy || true
+RUN go mod verify || true
 
-# Compilar con optimizaciones
+# Compilar con optimizaciones para Linux
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \
     -ldflags="-w -s -X main.version=$(git describe --tags --always --dirty 2>/dev/null || echo 'dev')" \
     -o go-reverseproxy-ssl \

build/package/Dockerfile.quickstart

@@ -21,10 +21,10 @@ COPY . .
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \
     -ldflags="-w -s" \
     -o reverseproxy \
-    .
+    ./cmd/reverseproxy
 
 # Runtime stage
-FROM alpine:3.19
+FROM alpine:latest
 
 # Install runtime dependencies
 RUN apk add --no-cache \
@@ -33,24 +33,24 @@ RUN apk add --no-cache \
     && update-ca-certificates
 
 # Create app user
-RUN addgroup -g 1000 appuser && \
-    adduser -D -u 1000 -G appuser appuser
+RUN addgroup -g 1000 reverseproxy && \
+    adduser -D -u 1000 -G reverseproxy reverseproxy
 
 WORKDIR /app
 
 # Copy binary from builder
 COPY --from=builder /build/reverseproxy .
 
 # Copy entrypoint script
-COPY docker-entrypoint.sh /entrypoint.sh
+COPY build/package/docker-entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
 # Create directories for volumes
 RUN mkdir -p /app/certs /app/logs /app/config && \
-    chown -R appuser:appuser /app
+    chown -R reverseproxy:reverseproxy /app
 
 # Switch to non-root user
-USER appuser
+USER reverseproxy
 
 # Expose ports
 EXPOSE 80 443 8081

docker-compose.test.yml

@@ -30,7 +30,7 @@ services:
 
   grpc-backend:
     build:
-      context: ./build/package/docker/grpc-server
+      context: ../build/package/docker/grpc-server
       dockerfile: Dockerfile
     container_name: grpc-backend
     networks:
@@ -50,7 +50,7 @@ services:
       - "443:443"
     volumes:
       - ./integration/testdata:/tmp/mounted-certs:ro
-      - ./integration/testdata/config.json:/app/config/config.json:ro
+      - ./integration/testdata:/app/config:ro
     depends_on:
       - backend-8080
       - backend-8081

go.mod

@@ -4,30 +4,24 @@ go 1.25
 
 require (
 	github.com/google/uuid v1.6.0
-	github.com/improbable-eng/grpc-web v0.15.0
 	github.com/janmbaco/copier v1.0.0
 	github.com/janmbaco/go-infrastructure/v2 v2.0.0
 	github.com/jinzhu/copier v0.4.0
-	github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9
+	github.com/mwitkow/grpc-proxy v0.0.0-20250813121105-2866842de9a5
 	github.com/stretchr/testify v1.11.1
 	golang.org/x/crypto v0.43.0
 	golang.org/x/net v0.46.0
 	google.golang.org/grpc v1.76.0
 )
 
 require (
-	github.com/cenkalti/backoff/v4 v4.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/klauspost/compress v1.11.7 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rs/cors v1.7.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	golang.org/x/sys v0.38.0 // indirect
 	golang.org/x/text v0.30.0 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	nhooyr.io/websocket v1.8.6 // indirect
 )