Merge pull request #52 from wallarm/pipeline/fix-1663082704

pipeline: Fix build issues after go upgrade
wallarm · Sep 13, 2022 · 8aa2fc4 · 8aa2fc4
2 parents 6cc9cd7 + eb01a29
commit 8aa2fc4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml
@@ -105,7 +105,7 @@ jobs:
             go build                                             \
                 -ldflags="-X main.build=${{ env.X_TAG }} -extldflags=-static -s -w" \
                 -o /tmp/api-firewall-${{ matrix.artifact }}/api-firewall \
-                ./cmd/api-firewall                            && \
+                -buildvcs=false ./cmd/api-firewall            && \
             /tmp/api-firewall-${{ matrix.artifact }}/api-firewall -v && \
             readelf -h /tmp/api-firewall-${{ matrix.artifact }}/api-firewall && \
             cp LICENSE /tmp/api-firewall-${{ matrix.artifact }}/ && \
@@ -208,7 +208,7 @@ jobs:
             go build                                             \
                 -ldflags="-X main.build=${{ env.X_TAG }} -extldflags=-static -s -w" \
                 -o /tmp/api-firewall-${{ matrix.artifact }}/api-firewall \
-                ./cmd/api-firewall                            && \
+                -buildvcs=false ./cmd/api-firewall            && \
             /tmp/api-firewall-${{ matrix.artifact }}/api-firewall -v && \
             readelf -h /tmp/api-firewall-${{ matrix.artifact }}/api-firewall && \
             cp LICENSE /tmp/api-firewall-${{ matrix.artifact }}/ && \
@@ -262,7 +262,7 @@ jobs:
     needs:
       - draft-release
     env:
-      X_GO_VERSION: "1.19.1-r0"
+      X_GO_VERSION: "1.18.6-r0"
     strategy:
       matrix:
         include:
@@ -340,7 +340,7 @@ jobs:
             go build                                             \
                 -ldflags="-X main.build=${{ env.X_TAG }} -extldflags=-static -s -w" \
                 -o /tmp/api-firewall-${{ matrix.artifact }}/api-firewall \
-                ./cmd/api-firewall                            && \
+                -buildvcs=false ./cmd/api-firewall            && \
             /tmp/api-firewall-${{ matrix.artifact }}/api-firewall -v && \
             readelf -h /tmp/api-firewall-${{ matrix.artifact }}/api-firewall && \
             cp LICENSE /tmp/api-firewall-${{ matrix.artifact }}/ && \

diff --git a/Dockerfile b/Dockerfile
@@ -1,19 +1,21 @@
-FROM golang:1.19-alpine3.16 AS build
+FROM golang:1.18-alpine3.16 AS build
 
 ARG APIFIREWALL_VERSION
 ENV APIFIREWALL_VERSION=${APIFIREWALL_VERSION}
 
 RUN apk add --no-cache                       \
-        git                                  \
         gcc                                  \
-        make
+        git                                  \
+        make                                 \
+        musl-dev
 
 WORKDIR /build
 COPY . .
 
 RUN go mod download -x                    && \
     go build                                 \
         -ldflags="-X main.build=${APIFIREWALL_VERSION} -s -w" \
+        -buildvcs=false                      \
         -o ./api-firewall                    \
         ./cmd/api-firewall