Merge branch 'master' into set-conn-timeouts

minio · Aug 28, 2024 · 5382dc4 · 5382dc4
2 parents c9b02ca + ba87314
commit 5382dc4
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,7 +2,9 @@ name: goreleaser
 
 on:
   pull_request:
-  push:
+    types: [ opened, reopened, synchronize ]
+    branches:
+      - 'master'
 
 jobs:
   goreleaser:

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -78,6 +78,93 @@ dockers:
     # GOARCH of the built binary that should be used.
     goarch: amd64
     dockerfile: Dockerfile.release
+  - image_templates:
+      - "quay.io/minio/warp:{{ .Tag }}-amd64"
+    use: buildx
+    goarch: amd64
+    ids:
+      - warp
+    dockerfile: Dockerfile.release
+    build_flag_templates:
+      - "--platform=linux/amd64"
+  - image_templates:
+      - "quay.io/minio/warp:{{ .Tag }}-arm64"
+    use: buildx
+    goarch: arm64
+    ids:
+      - warp
+    dockerfile: Dockerfile.release
+    build_flag_templates:
+      - "--platform=linux/arm64"
+  - image_templates:
+      - "quay.io/minio/warp:latest-amd64"
+    use: buildx
+    goarch: amd64
+    ids:
+      - warp
+    dockerfile: Dockerfile.release
+    build_flag_templates:
+      - "--platform=linux/amd64"
+  - image_templates:
+      - "quay.io/minio/warp:latest-arm64"
+    use: buildx
+    goarch: arm64
+    ids:
+      - warp
+    dockerfile: Dockerfile.release
+    build_flag_templates:
+      - "--platform=linux/arm64"
+
+  - image_templates:
+      - "minio/warp:{{ .Tag }}-amd64"
+    use: buildx
+    goarch: amd64
+    ids:
+      - warp
+    dockerfile: Dockerfile.release
+    build_flag_templates:
+      - "--platform=linux/amd64"
+  - image_templates:
+      - "minio/warp:{{ .Tag }}-arm64"
+    use: buildx
+    goarch: arm64
+    ids:
+      - warp
+    dockerfile: Dockerfile.release
+    build_flag_templates:
+      - "--platform=linux/arm64"
+  - image_templates:
+      - "minio/warp:latest-amd64"
+    use: buildx
+    goarch: amd64
+    ids:
+      - warp
+    dockerfile: Dockerfile.release
+    build_flag_templates:
+      - "--platform=linux/amd64"
+  - image_templates:
+      - "minio/warp:latest-arm64"
+    use: buildx
+    goarch: arm64
+    ids:
+      - warp
+    dockerfile: Dockerfile.release
+    build_flag_templates:
+      - "--platform=linux/arm64"
+docker_manifests:
+  - name_template: minio/warp:{{ .Tag }}
+    image_templates:
+      - minio/warp:{{ .Tag }}-amd64
+      - minio/warp:{{ .Tag }}-arm64
+  - name_template: minio/warp:latest
+    image_templates:
+      - minio/warp:latest-amd64
+      - minio/warp:latest-arm64
+  - name_template: quay.io/minio/warp:{{ .Tag }}
+    image_templates:
+      - quay.io/minio/warp:{{ .Tag }}-amd64
+      - quay.io/minio/warp:{{ .Tag }}-arm64
+  - name_template: quay.io/minio/warp:latest
     image_templates:
-      - "minio/warp:{{ .Tag }}"
-      - "minio/warp:latest"
+      - quay.io/minio/warp:latest-amd64
+      - quay.io/minio/warp:latest-arm64
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18
+FROM golang:1.22
 
 ADD go.mod /go/src/github.com/minio/warp/go.mod
 ADD go.sum /go/src/github.com/minio/warp/go.sum