Compare commits

..

3 Commits

Author SHA1 Message Date
Minio Trusted
6a96ec8177 use .Tag instead of .Version to have consistent naming 2021-01-19 02:09:40 -08:00
Minio Trusted
85398eec53 add v prefix for container {version} 2021-01-19 00:46:15 -08:00
Minio Trusted
e7f220b069 fix: update goreleaser and docker 2021-01-18 17:53:05 -08:00
7 changed files with 84 additions and 67 deletions

View File

@@ -3,89 +3,73 @@
project_name: console project_name: console
release: release:
name_template: "Version {{.Version}}" name_template: "Release version {{.Version}}"
github: github:
owner: minio owner: minio
name: console name: console
extra_files:
- glob: "*.minisig"
before: before:
hooks: hooks:
# you may remove this if you don't use vgo # you may remove this if you don't use vgo
- go mod tidy - 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: builds:
- -
goos: goos:
- freebsd
- windows
- linux - linux
- darwin - darwin
- windows
goarch: goarch:
- amd64 - amd64
- ppc64le
- s390x
- arm64 - arm64
ignore: ignore:
- goos: darwin - goos: darwin
goarch: arm64 goarch: arm64
- goos: darwin - goos: darwin
goarch: arm goarch: arm
- goos: darwin
goarch: ppc64le
- goos: darwin
goarch: s390x
- goos: windows - goos: windows
goarch: arm64 goarch: arm64
- goos: windows - goos: windows
goarch: arm 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: env:
- CGO_ENABLED=0 - CGO_ENABLED=0
main: ./cmd/console/ main: ./cmd/console/
flags: flags:
- -trimpath - -trimpath
- --tags=kqueue - --tags=kqueue
ldflags: 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}} - -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: archives:
- -
name_template: "{{ .ProjectName }}-{{ .Os }}-{{ .Arch }}"
format: binary
replacements: replacements:
darwin: Darwin arm: arm
linux: Linux
windows: Windows signs:
freebsd: FreeBSD -
amd64: x86_64 signature: "${artifact}.minisig"
format_overrides: cmd: "sh"
- goos: windows args:
format: zip - '-c'
files: - 'minisign -s /media/${USER}/minio/minisign.key -Sm ${artifact} < /media/${USER}/minio/minisign-passphrase'
- README.md artifacts: all
- LICENSE
checksum:
name_template: 'checksums.txt'
snapshot: snapshot:
name_template: 'snapshot-{{ time "2006-01-02" }}' name_template: v0.0.0@{{.ShortCommit}}
changelog: changelog:
sort: asc sort: asc
filters:
exclude:
- '^docs:'
- '^test:'
nfpms: nfpms:
- -
vendor: MinIO Inc. vendor: MinIO Inc.
@@ -96,18 +80,55 @@ nfpms:
formats: formats:
- deb - deb
- rpm - rpm
replacements:
darwin: Darwin
linux: Linux
freebsd: FreeBSD
amd64: x86_64
dockers: dockers:
- - image_templates:
# GOOS of the built binary that should be used. - "minio/console:{{ .Tag }}-amd64"
goos: linux use_buildx: true
# GOARCH of the built binary that should be used. dockerfile: Dockerfile.release
goarch: amd64 extra_files:
dockerfile: Dockerfile.release - LICENSE
image_templates: - CREDITS
- "minio/console:{{ .Tag }}" build_flag_templates:
- "minio/console:latest" - "--platform=linux/amd64"
- image_templates:
- "minio/console:{{ .Tag }}-ppc64le"
use_buildx: true
dockerfile: Dockerfile.release
extra_files:
- LICENSE
- CREDITS
build_flag_templates:
- "--platform=linux/ppc64le"
- image_templates:
- "minio/console:{{ .Tag }}-s390x"
use_buildx: true
dockerfile: Dockerfile.release
extra_files:
- LICENSE
- CREDITS
build_flag_templates:
- "--platform=linux/s390x"
- image_templates:
- "minio/console:{{ .Tag }}-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:{{ .Tag }}
image_templates:
- minio/console:{{ .Tag }}-amd64
- minio/console:{{ .Tag }}-arm64
- minio/console:{{ .Tag }}-ppc64le
- minio/console:{{ .Tag }}-s390x
- name_template: minio/console:latest
image_templates:
- minio/console:{{ .Tag }}-amd64
- minio/console:{{ .Tag }}-arm64
- minio/console:{{ .Tag }}-ppc64le
- minio/console:{{ .Tag }}-s390x

View File

@@ -6,15 +6,15 @@ COPY LICENSE /licenses/LICENSE
LABEL name="MinIO" \ LABEL name="MinIO" \
vendor="MinIO Inc <dev@min.io>" \ vendor="MinIO Inc <dev@min.io>" \
maintainer="MinIO Inc <dev@min.io>" \ maintainer="MinIO Inc <dev@min.io>" \
version="v0.4.6" \ version="v0.5.1" \
release="v0.4.6" \ release="v0.5.1" \
summary="A graphical user interface for MinIO" \ 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." 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 \ RUN \
microdnf update --nodocs && \ microdnf update --nodocs && \
microdnf install ca-certificates --nodocs microdnf install ca-certificates --nodocs
EXPOSE 9090 EXPOSE 9090
COPY console /console COPY console /console

4
go.sum
View File

@@ -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.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 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/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 h1:UnFJL5tYkdtXPeWUoxGwDkpVoWRwT4Fs1SFmjbcNjls=
github.com/minio/operator/logsearchapi v0.0.0-20201217190212-bf6546b09012/go.mod h1:kpA0C8LRbfUGVzGSC+Px7WYRiczblwqiRnP0ENv0tCU= 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= 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 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 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= 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 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= 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= k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=

View File

@@ -15,7 +15,7 @@ spec:
serviceAccountName: console-sa serviceAccountName: console-sa
containers: containers:
- name: console - name: console
image: minio/console:v0.4.6 image: minio/console:v0.5.1
imagePullPolicy: "IfNotPresent" imagePullPolicy: "IfNotPresent"
args: args:
- server - server

View File

@@ -15,7 +15,7 @@ spec:
serviceAccountName: console-sa serviceAccountName: console-sa
containers: containers:
- name: console - name: console
image: minio/console:v0.4.6 image: minio/console:v0.5.1
imagePullPolicy: "IfNotPresent" imagePullPolicy: "IfNotPresent"
env: env:
- name: CONSOLE_OPERATOR_MODE - name: CONSOLE_OPERATOR_MODE

View File

@@ -1029,7 +1029,7 @@ func Test_UpdateTenantAction(t *testing.T) {
}, },
params: admin_api.UpdateTenantParams{ params: admin_api.UpdateTenantParams{
Body: &models.UpdateTenantRequest{ Body: &models.UpdateTenantRequest{
ConsoleImage: "minio/console:v0.4.6", ConsoleImage: "minio/console:v0.5.1",
}, },
}, },
}, },

View File

@@ -63,7 +63,7 @@ const (
// Image versions // Image versions
const ( const (
KESImageVersion = "minio/kes:v0.13.1" KESImageVersion = "minio/kes:v0.13.1"
ConsoleImageDefaultVersion = "minio/console:v0.4.6" ConsoleImageDefaultVersion = "minio/console:v0.5.1"
) )
// K8s // K8s