Skip to content

Commit e7f220b

Browse files
committed
fix: update goreleaser and docker
1 parent 1bb7658 commit e7f220b

File tree

7 files changed

+83
-66
lines changed

7 files changed

+83
-66
lines changed

.goreleaser.yml

Lines changed: 76 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -7,85 +7,69 @@ release:
77
github:
88
owner: minio
99
name: console
10+
extra_files:
11+
- glob: "*.minisig"
1012

1113
before:
1214
hooks:
1315
# you may remove this if you don't use vgo
1416
- go mod tidy
15-
- docker build -f Dockerfile.assets -t consoleassets .
16-
- docker create --name extract consoleassets
17-
- docker cp extract:/app/bindata_assetfs.go ./portal-ui/
18-
- docker rm extract
1917

2018
builds:
2119
-
2220
goos:
23-
- freebsd
24-
- windows
2521
- linux
2622
- darwin
23+
- windows
2724
goarch:
2825
- amd64
26+
- ppc64le
27+
- s390x
2928
- arm64
30-
3129
ignore:
3230
- goos: darwin
3331
goarch: arm64
3432
- goos: darwin
3533
goarch: arm
36-
- goos: darwin
37-
goarch: ppc64le
38-
- goos: darwin
39-
goarch: s390x
4034
- goos: windows
4135
goarch: arm64
4236
- goos: windows
4337
goarch: arm
44-
- goos: windows
45-
goarch: ppc64le
46-
- goos: windows
47-
goarch: s390x
48-
- goos: freebsd
49-
goarch: arm
50-
- goos: freebsd
51-
goarch: arm64
52-
- goos: freebsd
53-
goarch: ppc64le
54-
- goos: freebsd
55-
goarch: s390x
5638

5739
env:
5840
- CGO_ENABLED=0
41+
5942
main: ./cmd/console/
43+
6044
flags:
6145
- -trimpath
6246
- --tags=kqueue
47+
6348
ldflags:
6449
- -s -w -X github.com/minio/console/pkg.ReleaseTag={{.Tag}} -X github.com/minio/console/pkg.CommitID={{.FullCommit}} -X github.com/minio/console/pkg.Version={{.Version}} -X github.com/minio/console/pkg.ShortCommitID={{.ShortCommit}} -X github.com/minio/console/pkg.ReleaseTime={{.Date}}
50+
6551
archives:
6652
-
53+
name_template: "{{ .ProjectName }}-{{ .Os }}-{{ .Arch }}"
54+
format: binary
6755
replacements:
68-
darwin: Darwin
69-
linux: Linux
70-
windows: Windows
71-
freebsd: FreeBSD
72-
amd64: x86_64
73-
format_overrides:
74-
- goos: windows
75-
format: zip
76-
files:
77-
- README.md
78-
- LICENSE
79-
checksum:
80-
name_template: 'checksums.txt'
56+
arm: arm
57+
58+
signs:
59+
-
60+
signature: "${artifact}.minisig"
61+
cmd: "sh"
62+
args:
63+
- '-c'
64+
- 'minisign -s /media/${USER}/minio/minisign.key -Sm ${artifact} < /media/${USER}/minio/minisign-passphrase'
65+
artifacts: all
66+
8167
snapshot:
82-
name_template: 'snapshot-{{ time "2006-01-02" }}'
68+
name_template: v0.0.0@{{.ShortCommit}}
69+
8370
changelog:
8471
sort: asc
85-
filters:
86-
exclude:
87-
- '^docs:'
88-
- '^test:'
72+
8973
nfpms:
9074
-
9175
vendor: MinIO Inc.
@@ -96,18 +80,55 @@ nfpms:
9680
formats:
9781
- deb
9882
- rpm
99-
replacements:
100-
darwin: Darwin
101-
linux: Linux
102-
freebsd: FreeBSD
103-
amd64: x86_64
83+
10484
dockers:
105-
-
106-
# GOOS of the built binary that should be used.
107-
goos: linux
108-
# GOARCH of the built binary that should be used.
109-
goarch: amd64
110-
dockerfile: Dockerfile.release
111-
image_templates:
112-
- "minio/console:{{ .Tag }}"
113-
- "minio/console:latest"
85+
- image_templates:
86+
- "minio/console:{{ .Version }}-amd64"
87+
use_buildx: true
88+
dockerfile: Dockerfile.release
89+
extra_files:
90+
- LICENSE
91+
- CREDITS
92+
build_flag_templates:
93+
- "--platform=linux/amd64"
94+
- image_templates:
95+
- "minio/console:{{ .Version }}-ppc64le"
96+
use_buildx: true
97+
dockerfile: Dockerfile.release
98+
extra_files:
99+
- LICENSE
100+
- CREDITS
101+
build_flag_templates:
102+
- "--platform=linux/ppc64le"
103+
- image_templates:
104+
- "minio/console:{{ .Version }}-s390x"
105+
use_buildx: true
106+
dockerfile: Dockerfile.release
107+
extra_files:
108+
- LICENSE
109+
- CREDITS
110+
build_flag_templates:
111+
- "--platform=linux/s390x"
112+
- image_templates:
113+
- "minio/console:{{ .Version }}-arm64"
114+
use_buildx: true
115+
goarch: arm64
116+
dockerfile: Dockerfile.release
117+
extra_files:
118+
- LICENSE
119+
- CREDITS
120+
build_flag_templates:
121+
- "--platform=linux/arm64"
122+
docker_manifests:
123+
- name_template: minio/console:{{ .Version }}
124+
image_templates:
125+
- minio/console:{{ .Version }}-amd64
126+
- minio/console:{{ .Version }}-arm64
127+
- minio/console:{{ .Version }}-ppc64le
128+
- minio/console:{{ .Version }}-s390x
129+
- name_template: minio/console:latest
130+
image_templates:
131+
- minio/console:{{ .Version }}-amd64
132+
- minio/console:{{ .Version }}-arm64
133+
- minio/console:{{ .Version }}-ppc64le
134+
- minio/console:{{ .Version }}-s390x

Dockerfile.release

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ COPY LICENSE /licenses/LICENSE
66
LABEL name="MinIO" \
77
vendor="MinIO Inc <dev@min.io>" \
88
maintainer="MinIO Inc <dev@min.io>" \
9-
version="v0.4.6" \
10-
release="v0.4.6" \
9+
version="v0.5.0" \
10+
release="v0.5.0" \
1111
summary="A graphical user interface for MinIO" \
1212
description="MinIO object storage is fundamentally different. Designed for performance and the S3 API, it is 100% open-source. MinIO is ideal for large, private cloud environments with stringent security requirements and delivers mission-critical availability across a diverse range of workloads."
1313

1414
RUN \
1515
microdnf update --nodocs && \
1616
microdnf install ca-certificates --nodocs
17-
17+
1818
EXPOSE 9090
1919
COPY console /console
2020

go.sum

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -946,8 +946,6 @@ github.com/minio/minio-go/v7 v7.0.6 h1:9czXaG0LEZ9s74smSqy0rm034MxngQoP6HTTuSc5G
946946
github.com/minio/minio-go/v7 v7.0.6/go.mod h1:HcIuq+11d/3MfavIPZiswSzfQ1VJ2Lwxp/XLtW46IWQ=
947947
github.com/minio/minio-go/v7 v7.0.7-0.20201217170524-3baf9ea06f7c h1:NgTbI1w/B+2Jcl+YKTULAAXqkwWqMZbkzmVdWNwzKnA=
948948
github.com/minio/minio-go/v7 v7.0.7-0.20201217170524-3baf9ea06f7c/go.mod h1:pEZBUa+L2m9oECoIA6IcSK8bv/qggtQVLovjeKK5jYc=
949-
github.com/minio/operator v0.0.0-20201204220226-9901d1d0766c h1:2QpnenH2gieq5yVh6sZYylXKCoBgwKkxcgqkLr/fq9M=
950-
github.com/minio/operator v0.0.0-20201204220226-9901d1d0766c/go.mod h1:Xnb44PIBZF/JCN4uXEEzf9vFwhnB9zXsQgVKU7GThiM=
951949
github.com/minio/operator/logsearchapi v0.0.0-20201217190212-bf6546b09012 h1:UnFJL5tYkdtXPeWUoxGwDkpVoWRwT4Fs1SFmjbcNjls=
952950
github.com/minio/operator/logsearchapi v0.0.0-20201217190212-bf6546b09012/go.mod h1:kpA0C8LRbfUGVzGSC+Px7WYRiczblwqiRnP0ENv0tCU=
953951
github.com/minio/selfupdate v0.3.1 h1:BWEFSNnrZVMUWXbXIgLDNDjbejkmpAmZvy/nCz1HlEs=
@@ -1872,8 +1870,6 @@ k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUc
18721870
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
18731871
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
18741872
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
1875-
k8s.io/klog/v2 v2.3.0 h1:WmkrnW7fdrm0/DMClc+HIxtftvxVIPAhlVwMQo5yLco=
1876-
k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
18771873
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
18781874
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
18791875
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=

k8s/console/base/console-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
serviceAccountName: console-sa
1616
containers:
1717
- name: console
18-
image: minio/console:v0.4.6
18+
image: minio/console:v0.5.0
1919
imagePullPolicy: "IfNotPresent"
2020
args:
2121
- server

k8s/operator-console/base/console-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ spec:
1515
serviceAccountName: console-sa
1616
containers:
1717
- name: console
18-
image: minio/console:v0.4.6
18+
image: minio/console:v0.5.0
1919
imagePullPolicy: "IfNotPresent"
2020
env:
2121
- name: CONSOLE_OPERATOR_MODE

restapi/admin_tenants_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,7 @@ func Test_UpdateTenantAction(t *testing.T) {
10291029
},
10301030
params: admin_api.UpdateTenantParams{
10311031
Body: &models.UpdateTenantRequest{
1032-
ConsoleImage: "minio/console:v0.4.6",
1032+
ConsoleImage: "minio/console:v0.5.0",
10331033
},
10341034
},
10351035
},

restapi/consts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ const (
6363
// Image versions
6464
const (
6565
KESImageVersion = "minio/kes:v0.13.1"
66-
ConsoleImageDefaultVersion = "minio/console:v0.4.6"
66+
ConsoleImageDefaultVersion = "minio/console:v0.5.0"
6767
)
6868

6969
// K8s

0 commit comments

Comments
 (0)