optimize docker build and fix version

dmachard · Oct 15, 2023 · 7e80cd6 · 7e80cd6
1 parent fc12b26
commit 7e80cd6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,7 +30,7 @@ jobs:
         go-version: ${{ matrix.go-version }}
 
     - name: build binary
-      run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o go-dnscollector *.go
+      run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o go-dnscollector *.go
 
   go-freebsd:
     runs-on: ubuntu-latest
@@ -46,7 +46,7 @@ jobs:
         go-version: ${{ matrix.go-version }}
 
     - name: build binary
-      run: CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build -o go-dnscollector *.go
+      run: CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build -ldflags="-s -w" -o go-dnscollector *.go
 
   # for macos and window, limit the build to the latest version
   go-macos:
@@ -63,7 +63,7 @@ jobs:
         go-version: ${{ matrix.go-version }}
 
     - name: build binary
-      run: CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -o go-dnscollector *.go
+      run: CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -o go-dnscollector *.go
 
   go-win:
     runs-on: windows-latest
@@ -81,7 +81,7 @@ jobs:
     - name: build binary
       run: |
         set CGO_ENABLED=0
-        go build -o go-dnscollector.exe .
+        go build -ldflags="-s -w" -o go-dnscollector.exe .
       
   docker:
     runs-on: ubuntu-latest

diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ ARG VERSION
 WORKDIR /build
 COPY . .
 RUN apk add git
-RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-X 'main.Version=$VERSION'"
+RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags="-s -w -X 'github.com/prometheus/common/version.Version=$VERSION'"
 
 
 FROM alpine:3.18.4