From 7009a7e4e1929097fdb4e6234a84c48bf3b16220 Mon Sep 17 00:00:00 2001 From: George Brownbridge Date: Wed, 18 Jun 2025 11:27:57 +0100 Subject: [PATCH 1/4] heathcheck-types-fix: Bumped version. --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2062e3d..40aa9aa 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ io.theworldavatar podman-java-client - ${revision} + ${revision}${changelist} jar Podman Java Client @@ -24,6 +24,7 @@ 11 11 4.4.0 + -1-SNAPSHOT ${project.basedir}/swagger-v${revision}.yaml From 6e0c9fc6421401031b3c66723d03627c22df334f Mon Sep 17 00:00:00 2001 From: George Brownbridge Date: Wed, 18 Jun 2025 11:28:53 +0100 Subject: [PATCH 2/4] heathcheck-types-fix: Fixed issue with types for fields in the `Schema2HealthConfig` class not being calculated correctly. --- swagger-v4.4.0.yaml | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/swagger-v4.4.0.yaml b/swagger-v4.4.0.yaml index 4ab8a64..500239d 100644 --- a/swagger-v4.4.0.yaml +++ b/swagger-v4.4.0.yaml @@ -7645,7 +7645,8 @@ definitions: for the HEALTHCHECK feature, from docker/docker/api/types/container. properties: Interval: - $ref: "#/definitions/Duration" + format: int64 + type: integer Retries: description: |- Retries is the number of consecutive failures needed to consider a container as unhealthy. @@ -7653,7 +7654,8 @@ definitions: format: int64 type: integer StartPeriod: - $ref: "#/definitions/Duration" + format: int64 + type: integer Test: description: |- Test is the test to perform to check that the container is healthy. @@ -7667,7 +7669,8 @@ definitions: type: string type: array Timeout: - $ref: "#/definitions/Duration" + format: int64 + type: integer type: object x-go-package: github.com/containers/image/v5/manifest Schema2List: @@ -9499,7 +9502,7 @@ info: url: https://podman.io/community/ description: |- This documentation describes the Podman v2.x+ RESTful API. It consists of a Docker-compatible - API and a Libpod API providing support for Podman’s unique features such as pods. + API and a Libpod API providing support for Podmanďż˝s unique features such as pods. To start the service and keep it running for 5,000 seconds (-t 0 runs forever): @@ -9597,7 +9600,7 @@ paths: type: string - description: | A Git repository URI or HTTP/HTTPS context URI. - If the URI points to a single text file, the file’s contents are placed + If the URI points to a single text file, the fileďż˝s contents are placed into a file called Dockerfile and the image is built from that file. If the URI points to a tarball, the file is downloaded by the daemon and the contents therein used as the context for the build. If the URI points to a @@ -10336,7 +10339,7 @@ paths: - containers (compat) /containers/{name}/stats: get: - description: This returns a live stream of a container’s resource usage statistics. + description: This returns a live stream of a containerďż˝s resource usage statistics. operationId: ContainerStats parameters: - description: the name or ID of the container @@ -10574,7 +10577,7 @@ paths: parameters: - description: | Filters to process on the prune list, encoded as JSON (a `map[string][]string`). Available filters: - - `until=` Prune containers created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. + - `until=` Prune containers created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. - `label` (`label=`, `label==`, `label!=`, or `label!==`) Prune containers with (or without, in case `label!=...` is used) the specified labels. in: query name: filters @@ -11036,7 +11039,7 @@ paths: - `dangling=` When set to `true` (or `1`), prune only unused *and* untagged images. When set to `false` (or `0`), all unused images are pruned. - - `until=` Prune images created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. + - `until=` Prune images created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. - `label` (`label=`, `label==`, `label!=`, or `label!==`) Prune images with (or without, in case `label!=...` is used) the specified labels. in: query name: filters @@ -11192,7 +11195,7 @@ paths: type: string - description: | A Git repository URI or HTTP/HTTPS context URI. - If the URI points to a single text file, the file’s contents are placed + If the URI points to a single text file, the fileďż˝s contents are placed into a file called Dockerfile and the image is built from that file. If the URI points to a tarball, the file is downloaded by the daemon and the contents therein used as the context for the build. If the URI points to a @@ -12527,7 +12530,7 @@ paths: parameters: - description: | Filters to process on the prune list, encoded as JSON (a `map[string][]string`). Available filters: - - `until=` Prune containers created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. + - `until=` Prune containers created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. - `label` (`label=`, `label==`, `label!=`, or `label!==`) Prune containers with (or without, in case `label!=...` is used) the specified labels. in: query name: filters @@ -13332,7 +13335,7 @@ paths: - `dangling=` When set to `true` (or `1`), prune only unused *and* untagged images. When set to `false` (or `0`), all unused images are pruned. - - `until=` Prune images created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. + - `until=` Prune images created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. - `label` (`label=`, `label==`, `label!=`, or `label!==`) Prune images with (or without, in case `label!=...` is used) the specified labels. in: query name: filters @@ -14080,7 +14083,7 @@ paths: - description: | Filters to process on the prune list, encoded as JSON (a `map[string][]string`). Available filters: - - `until=` Prune networks created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. + - `until=` Prune networks created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. - `label` (`label=`, `label==`, `label!=`, or `label!==`) Prune networks with (or without, in case `label!=...` is used) the specified labels. in: query name: filters @@ -14469,7 +14472,7 @@ paths: - `id=` Matches all of pod id. - `label=` or `label=:` Matches pods based on the presence of a label alone or a label and a value. - `name=` Matches all of pod name. - - `until=` List pods created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. + - `until=` List pods created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. - `status=` Pod's status: `stopped`, `running`, `paused`, `exited`, `dead`, `created`, `degraded`. - `network=` Name or full ID of network. - `ctr-names=` Container name within the pod. @@ -14781,7 +14784,7 @@ paths: - label= or label=: Matches volumes based on the presence of a label alone or a label and a value. - name= Matches all of volume name. - opt= Matches a storage driver options - - `until=` List volumes created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. + - `until=` List volumes created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. in: query name: filters type: string @@ -14802,7 +14805,7 @@ paths: - description: | JSON encoded value of filters (a map[string][]string) to match volumes against before pruning. Available filters: - - `until=` Prune volumes created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. + - `until=` Prune volumes created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. - `label` (`label=`, `label==`, `label!=`, or `label!==`) Prune volumes with (or without, in case `label!=...` is used) the specified labels. in: query name: filters @@ -14983,7 +14986,7 @@ paths: - description: | Filters to process on the prune list, encoded as JSON (a map[string][]string). Available filters: - - `until=` Prune networks created before this timestamp. The can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. + - `until=` Prune networks created before this timestamp. The can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. - `label` (`label=`, `label==`, `label!=`, or `label!==`) Prune networks with (or without, in case `label!=...` is used) the specified labels. in: query name: filters @@ -15125,7 +15128,7 @@ paths: - driver= Matches volumes based on their driver. - label= or label=: Matches volumes based on the presence of a label alone or a label and a value. - name= Matches all of volume name. - - `until=` List volumes created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. + - `until=` List volumes created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. Note: The boolean `dangling` filter is not yet implemented for this endpoint. @@ -15218,7 +15221,7 @@ paths: - description: | JSON encoded value of filters (a map[string][]string) to match volumes against before pruning. Available filters: - - `until=` Prune volumes created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. + - `until=` Prune volumes created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. - `label` (`label=`, `label==`, `label!=`, or `label!==`) Prune volumes with (or without, in case `label!=...` is used) the specified labels. in: query name: filters From b820723c043520fa3af3cfa834d6493b26391d52 Mon Sep 17 00:00:00 2001 From: George Brownbridge Date: Wed, 18 Jun 2025 11:39:22 +0100 Subject: [PATCH 3/4] heathcheck-types-fix: Fixed encoding of apostrophes. --- swagger-v4.4.0.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/swagger-v4.4.0.yaml b/swagger-v4.4.0.yaml index 500239d..aefb2f3 100644 --- a/swagger-v4.4.0.yaml +++ b/swagger-v4.4.0.yaml @@ -9502,7 +9502,7 @@ info: url: https://podman.io/community/ description: |- This documentation describes the Podman v2.x+ RESTful API. It consists of a Docker-compatible - API and a Libpod API providing support for Podmanďż˝s unique features such as pods. + API and a Libpod API providing support for Podman’s unique features such as pods. To start the service and keep it running for 5,000 seconds (-t 0 runs forever): @@ -9600,7 +9600,7 @@ paths: type: string - description: | A Git repository URI or HTTP/HTTPS context URI. - If the URI points to a single text file, the fileďż˝s contents are placed + If the URI points to a single text file, the file’s contents are placed into a file called Dockerfile and the image is built from that file. If the URI points to a tarball, the file is downloaded by the daemon and the contents therein used as the context for the build. If the URI points to a @@ -10339,7 +10339,7 @@ paths: - containers (compat) /containers/{name}/stats: get: - description: This returns a live stream of a containerďż˝s resource usage statistics. + description: This returns a live stream of a container’s resource usage statistics. operationId: ContainerStats parameters: - description: the name or ID of the container @@ -10577,7 +10577,7 @@ paths: parameters: - description: | Filters to process on the prune list, encoded as JSON (a `map[string][]string`). Available filters: - - `until=` Prune containers created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. + - `until=` Prune containers created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. - `label` (`label=`, `label==`, `label!=`, or `label!==`) Prune containers with (or without, in case `label!=...` is used) the specified labels. in: query name: filters @@ -11039,7 +11039,7 @@ paths: - `dangling=` When set to `true` (or `1`), prune only unused *and* untagged images. When set to `false` (or `0`), all unused images are pruned. - - `until=` Prune images created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. + - `until=` Prune images created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. - `label` (`label=`, `label==`, `label!=`, or `label!==`) Prune images with (or without, in case `label!=...` is used) the specified labels. in: query name: filters @@ -11195,7 +11195,7 @@ paths: type: string - description: | A Git repository URI or HTTP/HTTPS context URI. - If the URI points to a single text file, the fileďż˝s contents are placed + If the URI points to a single text file, the file’s contents are placed into a file called Dockerfile and the image is built from that file. If the URI points to a tarball, the file is downloaded by the daemon and the contents therein used as the context for the build. If the URI points to a @@ -12530,7 +12530,7 @@ paths: parameters: - description: | Filters to process on the prune list, encoded as JSON (a `map[string][]string`). Available filters: - - `until=` Prune containers created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. + - `until=` Prune containers created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. - `label` (`label=`, `label==`, `label!=`, or `label!==`) Prune containers with (or without, in case `label!=...` is used) the specified labels. in: query name: filters @@ -13335,7 +13335,7 @@ paths: - `dangling=` When set to `true` (or `1`), prune only unused *and* untagged images. When set to `false` (or `0`), all unused images are pruned. - - `until=` Prune images created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. + - `until=` Prune images created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. - `label` (`label=`, `label==`, `label!=`, or `label!==`) Prune images with (or without, in case `label!=...` is used) the specified labels. in: query name: filters @@ -14083,7 +14083,7 @@ paths: - description: | Filters to process on the prune list, encoded as JSON (a `map[string][]string`). Available filters: - - `until=` Prune networks created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. + - `until=` Prune networks created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. - `label` (`label=`, `label==`, `label!=`, or `label!==`) Prune networks with (or without, in case `label!=...` is used) the specified labels. in: query name: filters @@ -14472,7 +14472,7 @@ paths: - `id=` Matches all of pod id. - `label=` or `label=:` Matches pods based on the presence of a label alone or a label and a value. - `name=` Matches all of pod name. - - `until=` List pods created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. + - `until=` List pods created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. - `status=` Pod's status: `stopped`, `running`, `paused`, `exited`, `dead`, `created`, `degraded`. - `network=` Name or full ID of network. - `ctr-names=` Container name within the pod. @@ -14784,7 +14784,7 @@ paths: - label= or label=: Matches volumes based on the presence of a label alone or a label and a value. - name= Matches all of volume name. - opt= Matches a storage driver options - - `until=` List volumes created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. + - `until=` List volumes created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. in: query name: filters type: string @@ -14805,7 +14805,7 @@ paths: - description: | JSON encoded value of filters (a map[string][]string) to match volumes against before pruning. Available filters: - - `until=` Prune volumes created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. + - `until=` Prune volumes created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. - `label` (`label=`, `label==`, `label!=`, or `label!==`) Prune volumes with (or without, in case `label!=...` is used) the specified labels. in: query name: filters @@ -14986,7 +14986,7 @@ paths: - description: | Filters to process on the prune list, encoded as JSON (a map[string][]string). Available filters: - - `until=` Prune networks created before this timestamp. The can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. + - `until=` Prune networks created before this timestamp. The can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. - `label` (`label=`, `label==`, `label!=`, or `label!==`) Prune networks with (or without, in case `label!=...` is used) the specified labels. in: query name: filters @@ -15128,7 +15128,7 @@ paths: - driver= Matches volumes based on their driver. - label= or label=: Matches volumes based on the presence of a label alone or a label and a value. - name= Matches all of volume name. - - `until=` List volumes created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. + - `until=` List volumes created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. Note: The boolean `dangling` filter is not yet implemented for this endpoint. @@ -15221,7 +15221,7 @@ paths: - description: | JSON encoded value of filters (a map[string][]string) to match volumes against before pruning. Available filters: - - `until=` Prune volumes created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machineďż˝s time. + - `until=` Prune volumes created before this timestamp. The `` can be Unix timestamps, date formatted timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed relative to the daemon machine’s time. - `label` (`label=`, `label==`, `label!=`, or `label!==`) Prune volumes with (or without, in case `label!=...` is used) the specified labels. in: query name: filters From 24d80f2a2020cde941efc63975ef17aa9bfb7a04 Mon Sep 17 00:00:00 2001 From: George Brownbridge Date: Thu, 19 Jun 2025 12:38:10 +0100 Subject: [PATCH 4/4] heathcheck-types-fix: Removed the SNAPSHOT qualifier. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 40aa9aa..8729f06 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 11 11 4.4.0 - -1-SNAPSHOT + -1 ${project.basedir}/swagger-v${revision}.yaml