summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-08-11 17:46:52 +0000
committerGitHub <noreply@github.com>2022-08-11 17:46:52 +0000
commit1798cccf3ea3145a82c0948437758a865d7c4c94 (patch)
treeaee4a8fd1ec7971365ec7558ca5d3b9bd63a48d6
parent92bbae40de3c48ee6b4692ab9e4d7cc14db242bb (diff)
parent62e889e2b08117edccb95b863bdd936547b362a7 (diff)
downloadpodman-1798cccf3ea3145a82c0948437758a865d7c4c94.tar.gz
podman-1798cccf3ea3145a82c0948437758a865d7c4c94.tar.bz2
podman-1798cccf3ea3145a82c0948437758a865d7c4c94.zip
Merge pull request #15157 from cdoern/apiLog
fix LogConfig type for libpod API
-rw-r--r--pkg/api/server/register_containers.go5
-rw-r--r--pkg/specgen/specgen.go3
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.