diff options
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 4 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/containers_runlabel.go | 7 | ||||
| -rw-r--r-- | pkg/specgenutil/specgen.go | 8 | ||||
| -rw-r--r-- | test/e2e/run_entrypoint_test.go | 1 | ||||
| -rw-r--r-- | test/e2e/runlabel_test.go | 20 | ||||
| -rw-r--r-- | vendor/github.com/uber/jaeger-client-go/thrift/header_context.go | 2 | ||||
| -rw-r--r-- | vendor/github.com/uber/jaeger-client-go/thrift/response_helper.go | 2 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
9 files changed, 11 insertions, 37 deletions
@@ -59,7 +59,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 - github.com/uber/jaeger-client-go v2.29.1+incompatible + github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/vbauerster/mpb/v6 v6.0.4 github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5 go.etcd.io/bbolt v1.3.6 @@ -936,8 +936,8 @@ github.com/tchap/go-patricia v2.3.0+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA= -github.com/uber/jaeger-client-go v2.29.1+incompatible h1:R9ec3zO3sGpzs0abd43Y+fBZRJ9uiH6lXyR/+u6brW4= -github.com/uber/jaeger-client-go v2.29.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= +github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= +github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= diff --git a/pkg/domain/infra/abi/containers_runlabel.go b/pkg/domain/infra/abi/containers_runlabel.go index b0aae4b76..716e77716 100644 --- a/pkg/domain/infra/abi/containers_runlabel.go +++ b/pkg/domain/infra/abi/containers_runlabel.go @@ -111,7 +111,6 @@ func generateRunlabelCommand(runlabel string, img *libimage.Image, inputName str var ( err error name, imageName string - globalOpts string cmd []string ) @@ -144,7 +143,7 @@ func generateRunlabelCommand(runlabel string, img *libimage.Image, inputName str runlabel = fmt.Sprintf("%s %s", runlabel, strings.Join(args, " ")) } - cmd, err = generateCommand(runlabel, imageName, name, globalOpts) + cmd, err = generateCommand(runlabel, imageName, name) if err != nil { return nil, nil, err } @@ -209,7 +208,7 @@ func replaceImage(arg, image string) string { } // generateCommand takes a label (string) and converts it to an executable command -func generateCommand(command, imageName, name, globalOpts string) ([]string, error) { +func generateCommand(command, imageName, name string) ([]string, error) { if name == "" { name = imageName } @@ -231,8 +230,6 @@ func generateCommand(command, imageName, name, globalOpts string) ([]string, err newArg = fmt.Sprintf("IMAGE=%s", imageName) case "NAME=NAME": newArg = fmt.Sprintf("NAME=%s", name) - case "$GLOBAL_OPTS": - newArg = globalOpts default: newArg = replaceName(arg, name) newArg = replaceImage(newArg, imageName) diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go index 637a6a8dd..5e4bd2f65 100644 --- a/pkg/specgenutil/specgen.go +++ b/pkg/specgenutil/specgen.go @@ -409,11 +409,9 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions s.WorkDir = c.Workdir if c.Entrypoint != nil { entrypoint := []string{} - if ep := *c.Entrypoint; len(ep) > 0 { - // Check if entrypoint specified is json - if err := json.Unmarshal([]byte(*c.Entrypoint), &entrypoint); err != nil { - entrypoint = append(entrypoint, ep) - } + // Check if entrypoint specified is json + if err := json.Unmarshal([]byte(*c.Entrypoint), &entrypoint); err != nil { + entrypoint = append(entrypoint, *c.Entrypoint) } s.Entrypoint = entrypoint } diff --git a/test/e2e/run_entrypoint_test.go b/test/e2e/run_entrypoint_test.go index e91e75adf..4fb6054e2 100644 --- a/test/e2e/run_entrypoint_test.go +++ b/test/e2e/run_entrypoint_test.go @@ -103,7 +103,6 @@ ENTRYPOINT ["grep", "Alpine", "/etc/os-release"] }) It("podman run user entrypoint overrides image entrypoint and image cmd", func() { - SkipIfRemote("#12521: podman-remote not handling passing empty --entrypoint") dockerfile := `FROM quay.io/libpod/alpine:latest CMD ["-i"] ENTRYPOINT ["grep", "Alpine", "/etc/os-release"] diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go index b7b27dc14..36c1f856c 100644 --- a/test/e2e/runlabel_test.go +++ b/test/e2e/runlabel_test.go @@ -18,10 +18,6 @@ var LsDockerfile = fmt.Sprintf(` FROM %s LABEL RUN ls -la`, ALPINE) -var GlobalDockerfile = fmt.Sprintf(` -FROM %s -LABEL RUN echo \$GLOBAL_OPTS`, ALPINE) - var PodmanRunlabelNameDockerfile = fmt.Sprintf(` FROM %s LABEL RUN podman run --name NAME IMAGE`, ALPINE) @@ -104,22 +100,6 @@ var _ = Describe("podman container runlabel", func() { Expect(result.OutputToString()).To(Not(ContainSubstring("panic"))) }) - It("podman container runlabel global options", func() { - fmt.Printf("FIXME: for lint. Remove when you fix this test: %s", GlobalDockerfile) - Skip("FIXME: $GLOBAL_OPTS does not work at all, #12436") - image := "podman-global-test:ls" - podmanTest.BuildImage(GlobalDockerfile, image, "false") - result := podmanTest.Podman([]string{"--syslog", "--log-level", "debug", "container", "runlabel", "RUN", image}) - result.WaitWithDefaultTimeout() - Expect(result).Should(Exit(0)) - - Expect(result.OutputToString()).To(ContainSubstring("--syslog true")) - Expect(result.OutputToString()).To(ContainSubstring("--log-level debug")) - result = podmanTest.Podman([]string{"rmi", image}) - result.WaitWithDefaultTimeout() - Expect(result).Should(Exit(0)) - }) - It("runlabel should fail with nonexistent authfile", func() { image := "podman-runlabel-test:podman" podmanTest.BuildImage(PodmanDockerfile, image, "false") diff --git a/vendor/github.com/uber/jaeger-client-go/thrift/header_context.go b/vendor/github.com/uber/jaeger-client-go/thrift/header_context.go index ac9bd4882..ca2556882 100644 --- a/vendor/github.com/uber/jaeger-client-go/thrift/header_context.go +++ b/vendor/github.com/uber/jaeger-client-go/thrift/header_context.go @@ -23,7 +23,7 @@ import ( "context" ) -// See https://godoc.org/context#WithValue on why do we need the unexported typedefs. +// See https://pkg.go.dev/context#WithValue on why do we need the unexported typedefs. type ( headerKey string headerKeyList int diff --git a/vendor/github.com/uber/jaeger-client-go/thrift/response_helper.go b/vendor/github.com/uber/jaeger-client-go/thrift/response_helper.go index d884c6ac6..02f061395 100644 --- a/vendor/github.com/uber/jaeger-client-go/thrift/response_helper.go +++ b/vendor/github.com/uber/jaeger-client-go/thrift/response_helper.go @@ -23,7 +23,7 @@ import ( "context" ) -// See https://godoc.org/context#WithValue on why do we need the unexported typedefs. +// See https://pkg.go.dev/context#WithValue on why do we need the unexported typedefs. type responseHelperKey struct{} // TResponseHelper defines a object with a set of helper functions that can be diff --git a/vendor/modules.txt b/vendor/modules.txt index b8e76af8c..3109a6698 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -644,7 +644,7 @@ github.com/stretchr/testify/require github.com/syndtr/gocapability/capability # github.com/tchap/go-patricia v2.3.0+incompatible github.com/tchap/go-patricia/patricia -# github.com/uber/jaeger-client-go v2.29.1+incompatible +# github.com/uber/jaeger-client-go v2.30.0+incompatible ## explicit github.com/uber/jaeger-client-go/log github.com/uber/jaeger-client-go/thrift |