mirror of https://github.com/containers/podman.git
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>
This commit is contained in:
parent
70b03400b1
commit
62e889e2b0
|
@ -11,9 +11,9 @@ import (
|
||||||
func (s *APIServer) registerContainersHandlers(r *mux.Router) error {
|
func (s *APIServer) registerContainersHandlers(r *mux.Router) error {
|
||||||
// swagger:operation POST /containers/create compat ContainerCreate
|
// swagger:operation POST /containers/create compat ContainerCreate
|
||||||
// ---
|
// ---
|
||||||
// summary: Create a container
|
|
||||||
// tags:
|
// tags:
|
||||||
// - containers (compat)
|
// - containers (compat)
|
||||||
|
// summary: Create a container
|
||||||
// produces:
|
// produces:
|
||||||
// - application/json
|
// - application/json
|
||||||
// parameters:
|
// parameters:
|
||||||
|
@ -678,9 +678,9 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error {
|
||||||
|
|
||||||
// swagger:operation POST /libpod/containers/create libpod ContainerCreateLibpod
|
// swagger:operation POST /libpod/containers/create libpod ContainerCreateLibpod
|
||||||
// ---
|
// ---
|
||||||
// summary: Create a container
|
|
||||||
// tags:
|
// tags:
|
||||||
// - containers
|
// - containers
|
||||||
|
// summary: Create a container
|
||||||
// produces:
|
// produces:
|
||||||
// - application/json
|
// - application/json
|
||||||
// parameters:
|
// parameters:
|
||||||
|
@ -689,6 +689,7 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error {
|
||||||
// description: attributes for creating a container
|
// description: attributes for creating a container
|
||||||
// schema:
|
// schema:
|
||||||
// $ref: "#/definitions/SpecGenerator"
|
// $ref: "#/definitions/SpecGenerator"
|
||||||
|
// required: true
|
||||||
// responses:
|
// responses:
|
||||||
// 201:
|
// 201:
|
||||||
// $ref: "#/responses/containerCreateResponse"
|
// $ref: "#/responses/containerCreateResponse"
|
||||||
|
|
|
@ -13,7 +13,8 @@ import (
|
||||||
spec "github.com/opencontainers/runtime-spec/specs-go"
|
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 {
|
type LogConfig struct {
|
||||||
// LogDriver is the container's log driver.
|
// LogDriver is the container's log driver.
|
||||||
// Optional.
|
// Optional.
|
||||||
|
|
Loading…
Reference in New Issue