diff options
| author | Charlie Doern <cdoern@redhat.com> | 2022-08-01 16:35:18 -0400 |
|---|---|---|
| committer | Charlie Doern <cdoern@redhat.com> | 2022-08-08 10:38:13 -0400 |
| commit | 62e889e2b08117edccb95b863bdd936547b362a7 (patch) | |
| tree | 08e904eef9c7b7709bc05529ef8cbe17632582eb /pkg | |
| parent | 70b03400b18c80ee8a2864d0af1012ec8683a26a (diff) | |
| download | podman-62e889e2b08117edccb95b863bdd936547b362a7.tar.gz podman-62e889e2b08117edccb95b863bdd936547b362a7.tar.bz2 podman-62e889e2b08117edccb95b863bdd936547b362a7.zip | |
fix LogConfig type for libpod API
[NO NEW TESTS NEEDED]
our native API was consuming the docker compat type for the API since the two have the exact same name. Fix this by renaming
LogConfig to LogConfigLibpod
resolves #15138
Signed-off-by: Charlie Doern <cdoern@redhat.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/api/server/register_containers.go | 5 | ||||
| -rw-r--r-- | pkg/specgen/specgen.go | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go index b319fc14a..8aba4ea05 100644 --- a/pkg/api/server/register_containers.go +++ b/pkg/api/server/register_containers.go @@ -11,9 +11,9 @@ import ( func (s *APIServer) registerContainersHandlers(r *mux.Router) error { // swagger:operation POST /containers/create compat ContainerCreate // --- - // summary: Create a container // tags: // - containers (compat) + // summary: Create a container // produces: // - application/json // parameters: @@ -678,9 +678,9 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error { // swagger:operation POST /libpod/containers/create libpod ContainerCreateLibpod // --- - // summary: Create a container // tags: // - containers + // summary: Create a container // produces: // - application/json // parameters: @@ -689,6 +689,7 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error { // description: attributes for creating a container // schema: // $ref: "#/definitions/SpecGenerator" + // required: true // responses: // 201: // $ref: "#/responses/containerCreateResponse" diff --git a/pkg/specgen/specgen.go b/pkg/specgen/specgen.go index c31c3f035..b90f07ef8 100644 --- a/pkg/specgen/specgen.go +++ b/pkg/specgen/specgen.go @@ -13,7 +13,8 @@ import ( spec "github.com/opencontainers/runtime-spec/specs-go" ) -// LogConfig describes the logging characteristics for a container +// LogConfig describes the logging characteristics for a container +// swagger:model LogConfigLibpod type LogConfig struct { // LogDriver is the container's log driver. // Optional. |