chore: docker buildx

lenye · Oct 19, 2023 · 4168f11 · 4168f11
1 parent d194d78
commit 4168f11
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 27 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,19 +31,16 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
           check-latest: true
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }}
 
-      - name: Docker Pull Base Image
-        run: |
-          docker pull --platform amd64 gcr.io/distroless/static-debian11
-          docker pull --platform arm64 gcr.io/distroless/static-debian11
-          docker pull --platform arm gcr.io/distroless/static-debian11
-
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v4
         with:

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -112,24 +112,6 @@ dockers:
       - "--label=org.opencontainers.image.source=https://github.com/lenye/{{.ProjectName}}"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
       - "--label=org.opencontainers.image.version={{.Version}}"
-  - image_templates:
-      - "ghcr.io/lenye/{{ .ProjectName }}:{{ .Tag }}-armv6"
-      - "ghcr.io/lenye/{{ .ProjectName }}:{{ .Version }}-armv6"
-      - "ghcr.io/lenye/{{ .ProjectName }}:latest-armv6"
-    use: buildx
-    goos: linux
-    goarch: arm
-    goarm: 6
-    dockerfile: Dockerfile
-    build_flag_templates:
-      - "--platform=linux/arm/v6"
-      - "--label=org.opencontainers.image.created={{.Date}}"
-      - "--label=org.opencontainers.image.title={{.ProjectName}}"
-      - "--label=org.opencontainers.image.description={{.ProjectName}}"
-      - "--label=org.opencontainers.image.url=https://github.com/lenye/{{.ProjectName}}"
-      - "--label=org.opencontainers.image.source=https://github.com/lenye/{{.ProjectName}}"
-      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
-      - "--label=org.opencontainers.image.version={{.Version}}"
   - image_templates:
       - "ghcr.io/lenye/{{ .ProjectName }}:{{ .Tag }}-armv7"
       - "ghcr.io/lenye/{{ .ProjectName }}:{{ .Version }}-armv7"
@@ -154,17 +136,14 @@ docker_manifests:
     image_templates:
       - ghcr.io/lenye/{{ .ProjectName }}:{{ .Tag }}-amd64
       - ghcr.io/lenye/{{ .ProjectName }}:{{ .Tag }}-arm64
-      - ghcr.io/lenye/{{ .ProjectName }}:{{ .Tag }}-armv6
       - ghcr.io/lenye/{{ .ProjectName }}:{{ .Tag }}-armv7
   - name_template: ghcr.io/lenye/{{ .ProjectName }}:{{ .Version }}
     image_templates:
       - ghcr.io/lenye/{{ .ProjectName }}:{{ .Version }}-amd64
       - ghcr.io/lenye/{{ .ProjectName }}:{{ .Version }}-arm64
-      - ghcr.io/lenye/{{ .ProjectName }}:{{ .Version }}-armv6
       - ghcr.io/lenye/{{ .ProjectName }}:{{ .Version }}-armv7
   - name_template: ghcr.io/lenye/{{ .ProjectName }}:latest
     image_templates:
       - ghcr.io/lenye/{{ .ProjectName }}:latest-amd64
       - ghcr.io/lenye/{{ .ProjectName }}:latest-arm64
-      - ghcr.io/lenye/{{ .ProjectName }}:latest-armv6
       - ghcr.io/lenye/{{ .ProjectName }}:latest-armv7