chore: update dockerfile for ci build

soulteary · Apr 4, 2024 · e5cc1bb · e5cc1bb
1 parent ef782a8
commit e5cc1bb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -9,6 +9,7 @@ builds:
     id: macos
     goos: [darwin]
     goarch: [amd64, arm64]
+    main: ./bin
 
   - <<: *build_defaults
     id: linux
@@ -22,7 +23,7 @@ dockers:
   - image_templates:
       - "soulteary/webhook:linux-amd64-{{ .Tag }}"
       - "soulteary/webhook:linux-amd64"
-    dockerfile: docker/Dockerfile.gorelease
+    dockerfile: docker/goreleaser/Dockerfile
     use: buildx
     goarch: amd64
     build_flag_templates:
@@ -40,7 +41,7 @@ dockers:
   - image_templates:
       - "soulteary/webhook:linux-arm64-{{ .Tag }}"
       - "soulteary/webhook:linux-arm64"
-    dockerfile: docker/Dockerfile.gorelease
+    dockerfile: docker/goreleaser/Dockerfile
     use: buildx
     goos: linux
     goarch: arm64
@@ -60,7 +61,7 @@ dockers:
   - image_templates:
       - "soulteary/webhook:linux-armv7-{{ .Tag }}"
       - "soulteary/webhook:linux-armv7"
-    dockerfile: docker/Dockerfile.gorelease
+    dockerfile: docker/goreleaser/Dockerfile
     use: buildx
     goos: linux
     goarch: arm
@@ -80,7 +81,7 @@ dockers:
   - image_templates:
       - "soulteary/webhook:linux-armv6-{{ .Tag }}"
       - "soulteary/webhook:linux-armv6"
-    dockerfile: docker/Dockerfile.gorelease
+    dockerfile: docker/goreleaser/Dockerfile
     use: buildx
     goos: linux
     goarch: arm
@@ -100,7 +101,7 @@ dockers:
   - image_templates:
       - "soulteary/webhook:linux-amd64-extend-{{ .Tag }}"
       - "soulteary/webhook:linux-amd64-extend"
-    dockerfile: docker/Dockerfile.gorelease-extend
+    dockerfile: docker/goreleaser/Dockerfile.extend
     use: buildx
     goarch: amd64
     build_flag_templates:
@@ -118,7 +119,7 @@ dockers:
   - image_templates:
       - "soulteary/webhook:linux-arm64-extend-{{ .Tag }}"
       - "soulteary/webhook:linux-arm64-extend"
-    dockerfile: docker/Dockerfile.gorelease-extend
+    dockerfile: docker/goreleaser/Dockerfile.extend
     use: buildx
     goos: linux
     goarch: arm64
@@ -138,7 +139,7 @@ dockers:
   - image_templates:
       - "soulteary/webhook:linux-armv7-extend-{{ .Tag }}"
       - "soulteary/webhook:linux-armv7-extend"
-    dockerfile: docker/Dockerfile.gorelease-extend
+    dockerfile: docker/goreleaser/Dockerfile.extend
     use: buildx
     goos: linux
     goarch: arm
@@ -158,7 +159,7 @@ dockers:
   - image_templates:
       - "soulteary/webhook:linux-armv6-extend-{{ .Tag }}"
       - "soulteary/webhook:linux-armv6-extend"
-    dockerfile: docker/Dockerfile.gorelease-extend
+    dockerfile: docker/goreleaser/Dockerfile.extend
     use: buildx
     goos: linux
     goarch: arm

diff --git a/docker/Dockerfile.gorelease → docker/goreleaser/Dockerfile b/docker/Dockerfile.gorelease → docker/goreleaser/Dockerfile
diff --git a/docker/Dockerfile.gorelease-extend → docker/goreleaser/Dockerfile.extend b/docker/Dockerfile.gorelease-extend → docker/goreleaser/Dockerfile.extend
diff --git a/docker/Dockerfile → docker/manual/Dockerfile b/docker/Dockerfile → docker/manual/Dockerfile
@@ -4,9 +4,9 @@ ENV CGO_ENABLED=0
 WORKDIR /app
 COPY . .
 RUN go mod download -x
-RUN go build -ldflags "-w -s"  -o webhook
+RUN go build -ldflags "-w -s" -o webhook ./bin
 
 FROM debian:stretch
 LABEL maintainer "soulteary <soulteary@gmail.com>"
 COPY --from=builder /app/webhook /bin/
-CMD webhook
+CMD webhook
diff --git a/docker/Dockerfile.alpine → docker/manual/Dockerfile.alpine b/docker/Dockerfile.alpine → docker/manual/Dockerfile.alpine
@@ -5,7 +5,7 @@ ENV CGO_ENABLED=0
 WORKDIR /app
 COPY . .
 RUN go mod download -x
-RUN go build -ldflags "-w -s" -o webhook
+RUN go build -ldflags "-w -s" -o webhook ./bin
 RUN upx -9 -o webhook.minify webhook && \
     chmod +x webhook.minify