From e7f220b0699a502fa3be092085884ce73a0f10bb Mon Sep 17 00:00:00 2001 From: Minio Trusted Date: Mon, 18 Jan 2021 15:31:43 -0800 Subject: [PATCH] fix: update goreleaser and docker --- .goreleaser.yml | 131 ++++++++++-------- Dockerfile.release | 6 +- go.sum | 4 - k8s/console/base/console-deployment.yaml | 2 +- .../base/console-deployment.yaml | 2 +- restapi/admin_tenants_test.go | 2 +- restapi/consts.go | 2 +- 7 files changed, 83 insertions(+), 66 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 046c908e5..6c05d89f1 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -7,85 +7,69 @@ release: github: owner: minio name: console + extra_files: + - glob: "*.minisig" before: hooks: # you may remove this if you don't use vgo - go mod tidy - - docker build -f Dockerfile.assets -t consoleassets . - - docker create --name extract consoleassets - - docker cp extract:/app/bindata_assetfs.go ./portal-ui/ - - docker rm extract builds: - goos: - - freebsd - - windows - linux - darwin + - windows goarch: - amd64 + - ppc64le + - s390x - arm64 - ignore: - goos: darwin goarch: arm64 - goos: darwin goarch: arm - - goos: darwin - goarch: ppc64le - - goos: darwin - goarch: s390x - goos: windows goarch: arm64 - goos: windows goarch: arm - - goos: windows - goarch: ppc64le - - goos: windows - goarch: s390x - - goos: freebsd - goarch: arm - - goos: freebsd - goarch: arm64 - - goos: freebsd - goarch: ppc64le - - goos: freebsd - goarch: s390x env: - CGO_ENABLED=0 + main: ./cmd/console/ + flags: - -trimpath - --tags=kqueue + ldflags: - -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}} + archives: - + name_template: "{{ .ProjectName }}-{{ .Os }}-{{ .Arch }}" + format: binary replacements: - darwin: Darwin - linux: Linux - windows: Windows - freebsd: FreeBSD - amd64: x86_64 - format_overrides: - - goos: windows - format: zip - files: - - README.md - - LICENSE -checksum: - name_template: 'checksums.txt' + arm: arm + +signs: + - + signature: "${artifact}.minisig" + cmd: "sh" + args: + - '-c' + - 'minisign -s /media/${USER}/minio/minisign.key -Sm ${artifact} < /media/${USER}/minio/minisign-passphrase' + artifacts: all + snapshot: - name_template: 'snapshot-{{ time "2006-01-02" }}' + name_template: v0.0.0@{{.ShortCommit}} + changelog: sort: asc - filters: - exclude: - - '^docs:' - - '^test:' + nfpms: - vendor: MinIO Inc. @@ -96,18 +80,55 @@ nfpms: formats: - deb - rpm - replacements: - darwin: Darwin - linux: Linux - freebsd: FreeBSD - amd64: x86_64 + dockers: - - - # GOOS of the built binary that should be used. - goos: linux - # GOARCH of the built binary that should be used. - goarch: amd64 - dockerfile: Dockerfile.release - image_templates: - - "minio/console:{{ .Tag }}" - - "minio/console:latest" +- image_templates: + - "minio/console:{{ .Version }}-amd64" + use_buildx: true + dockerfile: Dockerfile.release + extra_files: + - LICENSE + - CREDITS + build_flag_templates: + - "--platform=linux/amd64" +- image_templates: + - "minio/console:{{ .Version }}-ppc64le" + use_buildx: true + dockerfile: Dockerfile.release + extra_files: + - LICENSE + - CREDITS + build_flag_templates: + - "--platform=linux/ppc64le" +- image_templates: + - "minio/console:{{ .Version }}-s390x" + use_buildx: true + dockerfile: Dockerfile.release + extra_files: + - LICENSE + - CREDITS + build_flag_templates: + - "--platform=linux/s390x" +- image_templates: + - "minio/console:{{ .Version }}-arm64" + use_buildx: true + goarch: arm64 + dockerfile: Dockerfile.release + extra_files: + - LICENSE + - CREDITS + build_flag_templates: + - "--platform=linux/arm64" +docker_manifests: +- name_template: minio/console:{{ .Version }} + image_templates: + - minio/console:{{ .Version }}-amd64 + - minio/console:{{ .Version }}-arm64 + - minio/console:{{ .Version }}-ppc64le + - minio/console:{{ .Version }}-s390x +- name_template: minio/console:latest + image_templates: + - minio/console:{{ .Version }}-amd64 + - minio/console:{{ .Version }}-arm64 + - minio/console:{{ .Version }}-ppc64le + - minio/console:{{ .Version }}-s390x diff --git a/Dockerfile.release b/Dockerfile.release index afa1e8925..73415388a 100644 --- a/Dockerfile.release +++ b/Dockerfile.release @@ -6,15 +6,15 @@ COPY LICENSE /licenses/LICENSE LABEL name="MinIO" \ vendor="MinIO Inc " \ maintainer="MinIO Inc " \ - version="v0.4.6" \ - release="v0.4.6" \ + version="v0.5.0" \ + release="v0.5.0" \ summary="A graphical user interface for MinIO" \ 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." RUN \ microdnf update --nodocs && \ microdnf install ca-certificates --nodocs - + EXPOSE 9090 COPY console /console diff --git a/go.sum b/go.sum index c2b10c3e4..674837ee4 100644 --- a/go.sum +++ b/go.sum @@ -946,8 +946,6 @@ github.com/minio/minio-go/v7 v7.0.6 h1:9czXaG0LEZ9s74smSqy0rm034MxngQoP6HTTuSc5G github.com/minio/minio-go/v7 v7.0.6/go.mod h1:HcIuq+11d/3MfavIPZiswSzfQ1VJ2Lwxp/XLtW46IWQ= github.com/minio/minio-go/v7 v7.0.7-0.20201217170524-3baf9ea06f7c h1:NgTbI1w/B+2Jcl+YKTULAAXqkwWqMZbkzmVdWNwzKnA= github.com/minio/minio-go/v7 v7.0.7-0.20201217170524-3baf9ea06f7c/go.mod h1:pEZBUa+L2m9oECoIA6IcSK8bv/qggtQVLovjeKK5jYc= -github.com/minio/operator v0.0.0-20201204220226-9901d1d0766c h1:2QpnenH2gieq5yVh6sZYylXKCoBgwKkxcgqkLr/fq9M= -github.com/minio/operator v0.0.0-20201204220226-9901d1d0766c/go.mod h1:Xnb44PIBZF/JCN4uXEEzf9vFwhnB9zXsQgVKU7GThiM= github.com/minio/operator/logsearchapi v0.0.0-20201217190212-bf6546b09012 h1:UnFJL5tYkdtXPeWUoxGwDkpVoWRwT4Fs1SFmjbcNjls= github.com/minio/operator/logsearchapi v0.0.0-20201217190212-bf6546b09012/go.mod h1:kpA0C8LRbfUGVzGSC+Px7WYRiczblwqiRnP0ENv0tCU= 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 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -k8s.io/klog/v2 v2.3.0 h1:WmkrnW7fdrm0/DMClc+HIxtftvxVIPAhlVwMQo5yLco= -k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= diff --git a/k8s/console/base/console-deployment.yaml b/k8s/console/base/console-deployment.yaml index 7ae21c88f..26cd82cd1 100644 --- a/k8s/console/base/console-deployment.yaml +++ b/k8s/console/base/console-deployment.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: console-sa containers: - name: console - image: minio/console:v0.4.6 + image: minio/console:v0.5.0 imagePullPolicy: "IfNotPresent" args: - server diff --git a/k8s/operator-console/base/console-deployment.yaml b/k8s/operator-console/base/console-deployment.yaml index 8db508a7f..47e403dcc 100644 --- a/k8s/operator-console/base/console-deployment.yaml +++ b/k8s/operator-console/base/console-deployment.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: console-sa containers: - name: console - image: minio/console:v0.4.6 + image: minio/console:v0.5.0 imagePullPolicy: "IfNotPresent" env: - name: CONSOLE_OPERATOR_MODE diff --git a/restapi/admin_tenants_test.go b/restapi/admin_tenants_test.go index acd42a684..0b7cbb7ee 100644 --- a/restapi/admin_tenants_test.go +++ b/restapi/admin_tenants_test.go @@ -1029,7 +1029,7 @@ func Test_UpdateTenantAction(t *testing.T) { }, params: admin_api.UpdateTenantParams{ Body: &models.UpdateTenantRequest{ - ConsoleImage: "minio/console:v0.4.6", + ConsoleImage: "minio/console:v0.5.0", }, }, }, diff --git a/restapi/consts.go b/restapi/consts.go index f181276b4..24e56298f 100644 --- a/restapi/consts.go +++ b/restapi/consts.go @@ -63,7 +63,7 @@ const ( // Image versions const ( KESImageVersion = "minio/kes:v0.13.1" - ConsoleImageDefaultVersion = "minio/console:v0.4.6" + ConsoleImageDefaultVersion = "minio/console:v0.5.0" ) // K8s