Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rancher-cli for openSUSE:Factory checked in at 2023-09-20 13:28:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rancher-cli (Old) and /work/SRC/openSUSE:Factory/.rancher-cli.new.16627 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rancher-cli" Wed Sep 20 13:28:54 2023 rev:7 rq:1112110 version:2.7.7 Changes: -------- --- /work/SRC/openSUSE:Factory/rancher-cli/rancher-cli.changes 2022-12-05 18:01:55.476817958 +0100 +++ /work/SRC/openSUSE:Factory/.rancher-cli.new.16627/rancher-cli.changes 2023-09-20 13:31:28.323551626 +0200 @@ -1,0 +2,12 @@ +Tue Sep 19 04:51:49 UTC 2023 - ka...@b1-systems.de + +- Update to version 2.7.7: + * Add missing packages after moving Dapper image to BCI (#339) + * Bump Go and Dockerfile versions + * Fix cluster create --import flag (#332) + * Revert "Adds cluster-name flag instead of implied (#325)" + * Adds cluster-name flag instead of implied (#325) +- skipping non-existent releases between 2.7.0 and 2.7.7 +- BuildRequire go1.20 + +------------------------------------------------------------------- Old: ---- cli-2.7.0.tar.gz New: ---- cli-2.7.7.obscpio cli-2.7.7.tar.gz cli.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rancher-cli.spec ++++++ --- /var/tmp/diff_new_pack.vclPZg/_old 2023-09-20 13:31:30.027612675 +0200 +++ /var/tmp/diff_new_pack.vclPZg/_new 2023-09-20 13:31:30.031612818 +0200 @@ -1,7 +1,7 @@ # # spec file for package rancher-cli # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,14 +18,14 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: rancher-cli -Version: 2.7.0 +Version: 2.7.7 Release: 0 Summary: Rancher CLI License: Apache-2.0 URL: https://github.com/rancher/cli Source: https://github.com/rancher/cli/archive/refs/tags/v%{version}.tar.gz#/cli-%{version}.tar.gz Source1: vendor.tar.gz -BuildRequires: golang(API) = 1.16 +BuildRequires: golang(API) = 1.20 %description The Rancher Command Line Interface (CLI) is a unified tool for interacting with your Rancher Server. ++++++ _service ++++++ --- /var/tmp/diff_new_pack.vclPZg/_old 2023-09-20 13:31:30.063613964 +0200 +++ /var/tmp/diff_new_pack.vclPZg/_new 2023-09-20 13:31:30.067614108 +0200 @@ -1,7 +1,22 @@ <services> - <service name="download_files" mode="disabled"/> - <service name="go_modules" mode="disabled"> - <param name="archive">cli-2.7.0.tar.gz</param> + <service name="obs_scm" mode="manual"> + <param name="url">https://github.com/rancher/cli</param> + <param name="scm">git</param> + <param name="exclude">.git</param> + <param name="revision">v2.7.7</param> + <param name="versionformat">@PARENT_TAG@</param> + <param name="changesgenerate">enable</param> + <param name="versionrewrite-pattern">v(.*)</param> + </service> + <service name="set_version" mode="manual"> + </service> + <service name="tar" mode="buildtime"/> + <service name="recompress" mode="buildtime"> + <param name="file">*.tar</param> + <param name="compression">gz</param> + </service> + <service name="go_modules" mode="manual"> + <param name="archive">cli-2.7.7.obscpio</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.vclPZg/_old 2023-09-20 13:31:30.091614967 +0200 +++ /var/tmp/diff_new_pack.vclPZg/_new 2023-09-20 13:31:30.095615111 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/rancher/cli</param> - <param name="changesrevision">2144a4c449b479a4906aab94b0c4ac6af799c189</param></service></servicedata> + <param name="changesrevision">d8f002e61dd0e6bbb8bd2259bfd84880b5491def</param></service></servicedata> (No newline at EOF) ++++++ cli-2.7.0.tar.gz -> cli-2.7.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cli-2.7.0/.drone.yml new/cli-2.7.7/.drone.yml --- old/cli-2.7.0/.drone.yml 2022-08-31 19:14:29.000000000 +0200 +++ new/cli-2.7.7/.drone.yml 2023-09-15 22:27:13.000000000 +0200 @@ -9,7 +9,7 @@ steps: - name: build pull: default - image: rancher/dapper:1.10.3 + image: rancher/dapper:v0.6.0 commands: - dapper ci privileged: true @@ -19,7 +19,7 @@ - name: build-all-binaries pull: default - image: rancher/dapper:1.10.3 + image: rancher/dapper:v0.6.0 commands: - dapper ci - ls -lR dist/artifacts @@ -40,7 +40,7 @@ - name: stage-binaries pull: default - image: rancher/dapper:1.10.3 + image: rancher/dapper:v0.6.0 commands: - "cp -r ./bin/* ./package/" when: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cli-2.7.0/Dockerfile.dapper new/cli-2.7.7/Dockerfile.dapper --- old/cli-2.7.0/Dockerfile.dapper 2022-08-31 19:14:29.000000000 +0200 +++ new/cli-2.7.7/Dockerfile.dapper 2023-09-15 22:27:13.000000000 +0200 @@ -1,21 +1,15 @@ -FROM golang:1.16 -RUN apt-get update && \ - apt-get install -y xz-utils zip rsync +FROM registry.suse.com/bci/golang:1.19 -RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.46.2; +RUN zypper -n install docker rsync xz zip +ENV GOLANGCI_LINT v1.53.3 +RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin "$GOLANGCI_LINT" -ENV DOCKER_VERSION=20.10.5 - -RUN curl -sL https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz -o docker-${DOCKER_VERSION}.tgz && \ - tar -zxvf docker-${DOCKER_VERSION}.tgz -C /usr/bin docker/docker --strip-components 1 && \ - chmod +x /usr/bin/docker - -ENV PATH /go/bin:$PATH ENV DAPPER_SOURCE /go/src/github.com/rancher/cli ENV DAPPER_OUTPUT bin build/bin dist ENV DAPPER_DOCKER_SOCKET true ENV DAPPER_ENV TAG REPO GOOS CROSS DRONE_TAG + WORKDIR ${DAPPER_SOURCE} ENTRYPOINT ["./scripts/entry"] CMD ["ci"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cli-2.7.0/cmd/cluster.go new/cli-2.7.7/cmd/cluster.go --- old/cli-2.7.0/cmd/cluster.go 2022-08-31 19:14:29.000000000 +0200 +++ new/cli-2.7.7/cmd/cluster.go 2023-09-15 22:27:13.000000000 +0200 @@ -250,9 +250,6 @@ if ctx.NArg() == 0 { return cli.ShowSubcommandHelp(ctx) } - if ctx.Bool("import") { - return clusterImport(ctx) - } c, err := GetClient(ctx) if err != nil { return err @@ -758,58 +755,61 @@ } func getClusterConfig(ctx *cli.Context) (*managementClient.Cluster, error) { - config := managementClient.Cluster{ - RancherKubernetesEngineConfig: new(managementClient.RancherKubernetesEngineConfig), - } - - if ctx.String("rke-config") != "" { - bytes, err := readFileReturnJSON(ctx.String("rke-config")) - if err != nil { - return nil, err - } + config := managementClient.Cluster{} + config.Name = ctx.Args().First() + config.Description = ctx.String("description") - var jsonObject map[string]interface{} - if err = json.Unmarshal(bytes, &jsonObject); err != nil { - return nil, err + if !ctx.Bool("import") { + config.RancherKubernetesEngineConfig = new(managementClient.RancherKubernetesEngineConfig) + ignoreDockerVersion := ctx.BoolT("disable-docker-version") + config.RancherKubernetesEngineConfig.IgnoreDockerVersion = &ignoreDockerVersion + + if ctx.String("k8s-version") != "" { + config.RancherKubernetesEngineConfig.Version = ctx.String("k8s-version") } - // Most values in RancherKubernetesEngineConfig are defined with struct tags for both JSON and YAML in camelCase. - // Changing the tags will be a breaking change. For proper deserialization, we must convert all keys to camelCase. - // Note that we ignore kebab-case keys. Users themselves should ensure any relevant keys - // (especially top-level keys in `services`, like `kube-api` or `kube-controller`) are camelCase or snake-case in cluster config. - convertSnakeCaseKeysToCamelCase(jsonObject) - - marshalled, err := json.Marshal(jsonObject) - if err != nil { - return nil, err - } - if err = json.Unmarshal(marshalled, &config); err != nil { - return nil, err + if ctx.String("network-provider") != "" { + config.RancherKubernetesEngineConfig.Network = &managementClient.NetworkConfig{ + Plugin: ctx.String("network-provider"), + } } - } - config.Name = ctx.Args().First() - config.Description = ctx.String("description") + if ctx.String("rke-config") != "" { + bytes, err := readFileReturnJSON(ctx.String("rke-config")) + if err != nil { + return nil, err + } - ignoreDockerVersion := ctx.BoolT("disable-docker-version") - config.RancherKubernetesEngineConfig.IgnoreDockerVersion = &ignoreDockerVersion + var jsonObject map[string]interface{} + if err = json.Unmarshal(bytes, &jsonObject); err != nil { + return nil, err + } - if ctx.String("k8s-version") != "" { - config.RancherKubernetesEngineConfig.Version = ctx.String("k8s-version") - } + // Most values in RancherKubernetesEngineConfig are defined with struct tags for both JSON and YAML in camelCase. + // Changing the tags will be a breaking change. For proper deserialization, we must convert all keys to camelCase. + // Note that we ignore kebab-case keys. Users themselves should ensure any relevant keys + // (especially top-level keys in `services`, like `kube-api` or `kube-controller`) are camelCase or snake-case in cluster config. + convertSnakeCaseKeysToCamelCase(jsonObject) - if ctx.String("network-provider") != "" { - config.RancherKubernetesEngineConfig.Network = &managementClient.NetworkConfig{ - Plugin: ctx.String("network-provider"), + marshalled, err := json.Marshal(jsonObject) + if err != nil { + return nil, err + } + if err = json.Unmarshal(marshalled, &config); err != nil { + return nil, err + } } } if ctx.String("psp-default-policy") != "" { config.DefaultPodSecurityPolicyTemplateID = ctx.String("psp-default-policy") - config.RancherKubernetesEngineConfig.Services = &managementClient.RKEConfigServices{ - KubeAPI: &managementClient.KubeAPIService{ - PodSecurityPolicy: true, - }, + + if config.RancherKubernetesEngineConfig != nil { + config.RancherKubernetesEngineConfig.Services = &managementClient.RKEConfigServices{ + KubeAPI: &managementClient.KubeAPIService{ + PodSecurityPolicy: true, + }, + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cli-2.7.0/config/config.go new/cli-2.7.7/config/config.go --- old/cli-2.7.0/config/config.go 2022-08-31 19:14:29.000000000 +0200 +++ new/cli-2.7.7/config/config.go 2023-09-15 22:27:13.000000000 +0200 @@ -20,7 +20,7 @@ CurrentServer string } -//ServerConfig holds the config for each server the user has setup +// ServerConfig holds the config for each server the user has setup type ServerConfig struct { AccessKey string `json:"accessKey"` SecretKey string `json:"secretKey"` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cli-2.7.0/go.mod new/cli-2.7.7/go.mod --- old/cli-2.7.0/go.mod 2022-08-31 19:14:29.000000000 +0200 +++ new/cli-2.7.7/go.mod 2023-09-15 22:27:13.000000000 +0200 @@ -1,6 +1,6 @@ module github.com/rancher/cli -go 1.16 +go 1.19 replace k8s.io/client-go => k8s.io/client-go v0.20.1 @@ -18,11 +18,50 @@ github.com/sirupsen/logrus v1.8.1 github.com/stretchr/testify v1.7.0 github.com/urfave/cli v1.22.5 - golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 + golang.org/x/crypto v0.11.0 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/text v0.3.7 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c gopkg.in/yaml.v2 v2.4.0 - gopkg.in/yaml.v3 v3.0.0 // indirect k8s.io/client-go v12.0.0+incompatible ) + +require ( + github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/go-logr/logr v0.4.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/protobuf v1.4.3 // indirect + github.com/google/go-cmp v0.5.2 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/imdario/mergo v0.3.7 // indirect + github.com/json-iterator/go v1.1.10 // indirect + github.com/kr/pretty v0.2.1 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/mattn/go-colorable v0.1.7 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/mattn/go-runewidth v0.0.9 // indirect + github.com/mattn/go-tty v0.0.3 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/pkg/term v1.2.0-beta.2 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/rancher/wrangler v0.7.4-security1 // indirect + github.com/russross/blackfriday/v2 v2.0.1 // indirect + github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + golang.org/x/net v0.12.0 // indirect + golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect + golang.org/x/sys v0.10.0 // indirect + golang.org/x/term v0.10.0 // indirect + golang.org/x/text v0.11.0 // indirect + golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect + google.golang.org/appengine v1.6.5 // indirect + google.golang.org/protobuf v1.25.0 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v3 v3.0.0 // indirect + k8s.io/apimachinery v0.21.0 // indirect + k8s.io/klog/v2 v2.8.0 // indirect + k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cli-2.7.0/go.sum new/cli-2.7.7/go.sum --- old/cli-2.7.0/go.sum 2022-08-31 19:14:29.000000000 +0200 +++ new/cli-2.7.7/go.sum 2023-09-15 22:27:13.000000000 +0200 @@ -82,7 +82,6 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= @@ -405,17 +404,18 @@ github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d/go.mod h1:7DPO4domFU579Ga6E61sB9VFNaniPVwJP5C4bBCu3wA= github.com/rancher/lasso v0.0.0-20200515155337-a34e1e26ad91/go.mod h1:G6Vv2aj6xB2YjTVagmu4NkhBvbE8nBcGykHRENH6arI= github.com/rancher/lasso v0.0.0-20200820172840-0e4cc0ef5cb0/go.mod h1:OhBBBO1pBwYp0hacWdnvSGOj+XE9yMLOLnaypIlic18= +github.com/rancher/lasso v0.0.0-20200905045615-7fcb07d6a20b/go.mod h1:OhBBBO1pBwYp0hacWdnvSGOj+XE9yMLOLnaypIlic18= github.com/rancher/norman v0.0.0-20200820172041-261460ee9088 h1:7Y2H44mpeA3ZCiGkdauhRo7EN+B4a3bbBg9dkNY4HO8= github.com/rancher/norman v0.0.0-20200820172041-261460ee9088/go.mod h1:W9LfZ96OfjkWSGTy2DUqYPt47Jpzrs7eM0i3AAx6fOI= github.com/rancher/rancher/pkg/client v0.0.0-20211110212758-cc2b8beb1473 h1:ApjHsieVqHAZB8NZAt1/ggKu91QCpUo0Wp/DiWHYSkc= github.com/rancher/rancher/pkg/client v0.0.0-20211110212758-cc2b8beb1473/go.mod h1:UKAFuyRUIHtnss0+u3/21KZzsD4F/1IaHCBazsHKaww= github.com/rancher/wrangler v0.6.2-0.20200515155908-1923f3f8ec3f/go.mod h1:NmtmlLkchboIksYJuBemwcP4RBfv8FpeyhVoWXB9Wdc= -github.com/rancher/wrangler v0.6.2-0.20200820173016-2068de651106 h1:ed0NTDvIwulez4zVvBZ1U7mFe2PBxtHvJ9bn2l9bcZ8= github.com/rancher/wrangler v0.6.2-0.20200820173016-2068de651106/go.mod h1:iKqQcYs4YSDjsme52OZtQU4jHPmLlIiM93aj2c8c/W8= +github.com/rancher/wrangler v0.7.4-security1 h1:RQR56EZVQ/ow96pK9otKjSqs1jEQeVl2Mb2yElPbkHA= +github.com/rancher/wrangler v0.7.4-security1/go.mod h1:goezjesEKwMxHLfltdjg9DW0xWV7txQee6vOuSDqXAI= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -505,8 +505,8 @@ golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= +golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -574,8 +574,9 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 h1:OgUuv8lsRpBibGNbSizVwKWlysjaNzmC9gYMhPVfqFM= golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= +golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -635,11 +636,12 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= +golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -648,8 +650,8 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -839,7 +841,6 @@ k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -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.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= @@ -874,7 +875,6 @@ sigs.k8s.io/kustomize/kyaml v0.4.0/go.mod h1:XJL84E6sOFeNrQ7CADiemc1B0EjIxHo3OhW4o1aJYNw= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= -sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06 h1:zD2IemQ4LmOcAumeiyDWXKUI2SO0NYDe3H6QGvPOVgU= sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18= sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cli-2.7.0/package/Dockerfile new/cli-2.7.7/package/Dockerfile --- old/cli-2.7.0/package/Dockerfile 2022-08-31 19:14:29.000000000 +0200 +++ new/cli-2.7.7/package/Dockerfile 2023-09-15 22:27:13.000000000 +0200 @@ -1,6 +1,21 @@ -FROM alpine:3.13 -RUN apk add --no-cache ca-certificates openssh-client +FROM registry.suse.com/bci/bci-base:15.5 + +ARG user=cli + +RUN zypper -n update && \ + zypper -n install ca-certificates openssh-clients && \ + zypper clean -a && rm -rf /tmp/* /var/tmp/* /usr/share/doc/packages/* /usr/share/doc/manual/* /var/log/* + +RUN echo "$user:x:1000:1000::/home/$user:/bin/bash" >> /etc/passwd && \ + echo "$user:x:1000:" >> /etc/group && \ + mkdir /home/$user && \ + chown -R $user:$user /home/$user + COPY rancher /usr/bin/ -WORKDIR /mnt + +WORKDIR /home/$user + +USER 1000:1000 + ENTRYPOINT ["rancher"] CMD ["--help"] ++++++ cli.obsinfo ++++++ name: cli version: 2.7.7 mtime: 1694809633 commit: d8f002e61dd0e6bbb8bd2259bfd84880b5491def ++++++ vendor.tar.gz ++++++ ++++ 136124 lines of diff (skipped)
