Skip to content

Commit 6591301

Browse files
joelwurtzjoelwurtz
committed
Fix build args and container volumes
1 parent 44713db commit 6591301

11 files changed

+104
-186
lines changed

Diff for: ‎docker-swagger.yaml

+6-7
Original file line numberDiff line numberDiff line change
@@ -838,12 +838,11 @@ definitions:
838838
Volumes:
839839
description: "An object mapping mount point paths inside the container to empty objects."
840840
type: "object"
841-
properties:
842-
additionalProperties:
843-
type: "object"
844-
enum:
845-
- {}
846-
default: {}
841+
additionalProperties:
842+
type: "object"
843+
enum:
844+
- {}
845+
default: {}
847846
WorkingDir:
848847
description: "The working directory for commands to run in."
849848
type: "string"
@@ -6161,7 +6160,7 @@ paths:
61616160
- name: "buildargs"
61626161
in: "query"
61636162
description: "JSON map of string pairs for build-time variables. Users pass these values at build-time. Docker uses the buildargs as the environment context for commands run via the `Dockerfile` RUN instruction, or for variable expansion in other `Dockerfile` instructions. This is not meant for passing secret values. [Read more about the buildargs instruction.](https://docs.docker.com/engine/reference/builder/#arg)"
6164-
type: "integer"
6163+
type: "string"
61656164
- name: "shmsize"
61666165
in: "query"
61676166
description: "Size of `/dev/shm` in bytes. The size must be greater than 0. If omitted the system uses 64MB."

Diff for: ‎src/Client.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ public function imageList(array $queryParameters = [], string $fetch = self::FET
683683
* @var string $cpusetcpus CPUs in which to allow execution (e.g., `0-3`, `0,1`).
684684
* @var int $cpuperiod the length of a CPU period in microseconds
685685
* @var int $cpuquota microseconds of CPU time that the container can get in a CPU period
686-
* @var int $buildargs JSON map of string pairs for build-time variables. Users pass these values at build-time. Docker uses the buildargs as the environment context for commands run via the `Dockerfile` RUN instruction, or for variable expansion in other `Dockerfile` instructions. This is not meant for passing secret values. [Read more about the buildargs instruction.](https://docs.docker.com/engine/reference/builder/#arg)
686+
* @var string $buildargs JSON map of string pairs for build-time variables. Users pass these values at build-time. Docker uses the buildargs as the environment context for commands run via the `Dockerfile` RUN instruction, or for variable expansion in other `Dockerfile` instructions. This is not meant for passing secret values. [Read more about the buildargs instruction.](https://docs.docker.com/engine/reference/builder/#arg)
687687
* @var int $shmsize Size of `/dev/shm` in bytes. The size must be greater than 0. If omitted the system uses 64MB.
688688
* @var bool $squash Squash the resulting images layers into a single layer. *(Experimental release only.)*
689689
* @var string $labels arbitrary key/value labels to set on the image, as a JSON map of string pairs

Diff for: ‎src/ClientAsync.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ public function imageList(array $queryParameters = [], string $fetch = self::FET
683683
* @var string $cpusetcpus CPUs in which to allow execution (e.g., `0-3`, `0,1`).
684684
* @var int $cpuperiod the length of a CPU period in microseconds
685685
* @var int $cpuquota microseconds of CPU time that the container can get in a CPU period
686-
* @var int $buildargs JSON map of string pairs for build-time variables. Users pass these values at build-time. Docker uses the buildargs as the environment context for commands run via the `Dockerfile` RUN instruction, or for variable expansion in other `Dockerfile` instructions. This is not meant for passing secret values. [Read more about the buildargs instruction.](https://docs.docker.com/engine/reference/builder/#arg)
686+
* @var string $buildargs JSON map of string pairs for build-time variables. Users pass these values at build-time. Docker uses the buildargs as the environment context for commands run via the `Dockerfile` RUN instruction, or for variable expansion in other `Dockerfile` instructions. This is not meant for passing secret values. [Read more about the buildargs instruction.](https://docs.docker.com/engine/reference/builder/#arg)
687687
* @var int $shmsize Size of `/dev/shm` in bytes. The size must be greater than 0. If omitted the system uses 64MB.
688688
* @var bool $squash Squash the resulting images layers into a single layer. *(Experimental release only.)*
689689
* @var string $labels arbitrary key/value labels to set on the image, as a JSON map of string pairs

Diff for: ‎src/Endpoint/ImageBuild.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class ImageBuild extends \Jane\OpenApiRuntime\Client\BaseEndpoint implements \Ja
4141
* @var string $cpusetcpus CPUs in which to allow execution (e.g., `0-3`, `0,1`).
4242
* @var int $cpuperiod the length of a CPU period in microseconds
4343
* @var int $cpuquota microseconds of CPU time that the container can get in a CPU period
44-
* @var int $buildargs JSON map of string pairs for build-time variables. Users pass these values at build-time. Docker uses the buildargs as the environment context for commands run via the `Dockerfile` RUN instruction, or for variable expansion in other `Dockerfile` instructions. This is not meant for passing secret values. [Read more about the buildargs instruction.](https://docs.docker.com/engine/reference/builder/#arg)
44+
* @var string $buildargs JSON map of string pairs for build-time variables. Users pass these values at build-time. Docker uses the buildargs as the environment context for commands run via the `Dockerfile` RUN instruction, or for variable expansion in other `Dockerfile` instructions. This is not meant for passing secret values. [Read more about the buildargs instruction.](https://docs.docker.com/engine/reference/builder/#arg)
4545
* @var int $shmsize Size of `/dev/shm` in bytes. The size must be greater than 0. If omitted the system uses 64MB.
4646
* @var bool $squash Squash the resulting images layers into a single layer. *(Experimental release only.)*
4747
* @var string $labels arbitrary key/value labels to set on the image, as a JSON map of string pairs
@@ -124,7 +124,7 @@ protected function getQueryOptionsResolver(): \Symfony\Component\OptionsResolver
124124
$optionsResolver->setAllowedTypes('cpusetcpus', ['string']);
125125
$optionsResolver->setAllowedTypes('cpuperiod', ['int']);
126126
$optionsResolver->setAllowedTypes('cpuquota', ['int']);
127-
$optionsResolver->setAllowedTypes('buildargs', ['int']);
127+
$optionsResolver->setAllowedTypes('buildargs', ['string']);
128128
$optionsResolver->setAllowedTypes('shmsize', ['int']);
129129
$optionsResolver->setAllowedTypes('squash', ['bool']);
130130
$optionsResolver->setAllowedTypes('labels', ['string']);

Diff for: ‎src/Model/ContainerConfig.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class ContainerConfig
108108
/**
109109
* An object mapping mount point paths inside the container to empty objects.
110110
*
111-
* @var ContainerConfigVolumes
111+
* @var mixed[]
112112
*/
113113
protected $volumes;
114114
/**
@@ -538,21 +538,21 @@ public function setImage(?string $image): self
538538
/**
539539
* An object mapping mount point paths inside the container to empty objects.
540540
*
541-
* @return ContainerConfigVolumes
541+
* @return mixed[]
542542
*/
543-
public function getVolumes(): ?ContainerConfigVolumes
543+
public function getVolumes(): ?\ArrayObject
544544
{
545545
return $this->volumes;
546546
}
547547

548548
/**
549549
* An object mapping mount point paths inside the container to empty objects.
550550
*
551-
* @param ContainerConfigVolumes $volumes
551+
* @param mixed[] $volumes
552552
*
553553
* @return self
554554
*/
555-
public function setVolumes(?ContainerConfigVolumes $volumes): self
555+
public function setVolumes(?\ArrayObject $volumes): self
556556
{
557557
$this->volumes = $volumes;
558558

Diff for: ‎src/Model/ContainerConfigVolumes.php

-39
This file was deleted.

Diff for: ‎src/Model/ContainersCreatePostBody.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class ContainersCreatePostBody
108108
/**
109109
* An object mapping mount point paths inside the container to empty objects.
110110
*
111-
* @var ContainerConfigVolumes
111+
* @var mixed[]
112112
*/
113113
protected $volumes;
114114
/**
@@ -550,21 +550,21 @@ public function setImage(?string $image): self
550550
/**
551551
* An object mapping mount point paths inside the container to empty objects.
552552
*
553-
* @return ContainerConfigVolumes
553+
* @return mixed[]
554554
*/
555-
public function getVolumes(): ?ContainerConfigVolumes
555+
public function getVolumes(): ?\ArrayObject
556556
{
557557
return $this->volumes;
558558
}
559559

560560
/**
561561
* An object mapping mount point paths inside the container to empty objects.
562562
*
563-
* @param ContainerConfigVolumes $volumes
563+
* @param mixed[] $volumes
564564
*
565565
* @return self
566566
*/
567-
public function setVolumes(?ContainerConfigVolumes $volumes): self
567+
public function setVolumes(?\ArrayObject $volumes): self
568568
{
569569
$this->volumes = $volumes;
570570

Diff for: ‎src/Normalizer/ContainerConfigNormalizer.php

+42-34
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,21 @@ public function denormalize($data, $class, $format = null, array $context = [])
9696
$object->setImage($data->{'Image'});
9797
}
9898
if (property_exists($data, 'Volumes') && $data->{'Volumes'} !== null) {
99-
$object->setVolumes($this->denormalizer->denormalize($data->{'Volumes'}, 'Docker\\API\\Model\\ContainerConfigVolumes', 'json', $context));
99+
$values_3 = new \ArrayObject([], \ArrayObject::ARRAY_AS_PROPS);
100+
foreach ($data->{'Volumes'} as $key_1 => $value_3) {
101+
$values_3[$key_1] = $value_3;
102+
}
103+
$object->setVolumes($values_3);
100104
}
101105
if (property_exists($data, 'WorkingDir') && $data->{'WorkingDir'} !== null) {
102106
$object->setWorkingDir($data->{'WorkingDir'});
103107
}
104108
if (property_exists($data, 'Entrypoint') && $data->{'Entrypoint'} !== null) {
105-
$values_3 = [];
106-
foreach ($data->{'Entrypoint'} as $value_3) {
107-
$values_3[] = $value_3;
109+
$values_4 = [];
110+
foreach ($data->{'Entrypoint'} as $value_4) {
111+
$values_4[] = $value_4;
108112
}
109-
$object->setEntrypoint($values_3);
113+
$object->setEntrypoint($values_4);
110114
}
111115
if (property_exists($data, 'NetworkDisabled') && $data->{'NetworkDisabled'} !== null) {
112116
$object->setNetworkDisabled($data->{'NetworkDisabled'});
@@ -115,18 +119,18 @@ public function denormalize($data, $class, $format = null, array $context = [])
115119
$object->setMacAddress($data->{'MacAddress'});
116120
}
117121
if (property_exists($data, 'OnBuild') && $data->{'OnBuild'} !== null) {
118-
$values_4 = [];
119-
foreach ($data->{'OnBuild'} as $value_4) {
120-
$values_4[] = $value_4;
122+
$values_5 = [];
123+
foreach ($data->{'OnBuild'} as $value_5) {
124+
$values_5[] = $value_5;
121125
}
122-
$object->setOnBuild($values_4);
126+
$object->setOnBuild($values_5);
123127
}
124128
if (property_exists($data, 'Labels') && $data->{'Labels'} !== null) {
125-
$values_5 = new \ArrayObject([], \ArrayObject::ARRAY_AS_PROPS);
126-
foreach ($data->{'Labels'} as $key_1 => $value_5) {
127-
$values_5[$key_1] = $value_5;
129+
$values_6 = new \ArrayObject([], \ArrayObject::ARRAY_AS_PROPS);
130+
foreach ($data->{'Labels'} as $key_2 => $value_6) {
131+
$values_6[$key_2] = $value_6;
128132
}
129-
$object->setLabels($values_5);
133+
$object->setLabels($values_6);
130134
}
131135
if (property_exists($data, 'StopSignal') && $data->{'StopSignal'} !== null) {
132136
$object->setStopSignal($data->{'StopSignal'});
@@ -135,11 +139,11 @@ public function denormalize($data, $class, $format = null, array $context = [])
135139
$object->setStopTimeout($data->{'StopTimeout'});
136140
}
137141
if (property_exists($data, 'Shell') && $data->{'Shell'} !== null) {
138-
$values_6 = [];
139-
foreach ($data->{'Shell'} as $value_6) {
140-
$values_6[] = $value_6;
142+
$values_7 = [];
143+
foreach ($data->{'Shell'} as $value_7) {
144+
$values_7[] = $value_7;
141145
}
142-
$object->setShell($values_6);
146+
$object->setShell($values_7);
143147
}
144148

145149
return $object;
@@ -206,17 +210,21 @@ public function normalize($object, $format = null, array $context = [])
206210
$data->{'Image'} = $object->getImage();
207211
}
208212
if (null !== $object->getVolumes()) {
209-
$data->{'Volumes'} = $this->normalizer->normalize($object->getVolumes(), 'json', $context);
213+
$values_3 = new \stdClass();
214+
foreach ($object->getVolumes() as $key_1 => $value_3) {
215+
$values_3->{$key_1} = $value_3;
216+
}
217+
$data->{'Volumes'} = $values_3;
210218
}
211219
if (null !== $object->getWorkingDir()) {
212220
$data->{'WorkingDir'} = $object->getWorkingDir();
213221
}
214222
if (null !== $object->getEntrypoint()) {
215-
$values_3 = [];
216-
foreach ($object->getEntrypoint() as $value_3) {
217-
$values_3[] = $value_3;
223+
$values_4 = [];
224+
foreach ($object->getEntrypoint() as $value_4) {
225+
$values_4[] = $value_4;
218226
}
219-
$data->{'Entrypoint'} = $values_3;
227+
$data->{'Entrypoint'} = $values_4;
220228
}
221229
if (null !== $object->getNetworkDisabled()) {
222230
$data->{'NetworkDisabled'} = $object->getNetworkDisabled();
@@ -225,18 +233,18 @@ public function normalize($object, $format = null, array $context = [])
225233
$data->{'MacAddress'} = $object->getMacAddress();
226234
}
227235
if (null !== $object->getOnBuild()) {
228-
$values_4 = [];
229-
foreach ($object->getOnBuild() as $value_4) {
230-
$values_4[] = $value_4;
236+
$values_5 = [];
237+
foreach ($object->getOnBuild() as $value_5) {
238+
$values_5[] = $value_5;
231239
}
232-
$data->{'OnBuild'} = $values_4;
240+
$data->{'OnBuild'} = $values_5;
233241
}
234242
if (null !== $object->getLabels()) {
235-
$values_5 = new \stdClass();
236-
foreach ($object->getLabels() as $key_1 => $value_5) {
237-
$values_5->{$key_1} = $value_5;
243+
$values_6 = new \stdClass();
244+
foreach ($object->getLabels() as $key_2 => $value_6) {
245+
$values_6->{$key_2} = $value_6;
238246
}
239-
$data->{'Labels'} = $values_5;
247+
$data->{'Labels'} = $values_6;
240248
}
241249
if (null !== $object->getStopSignal()) {
242250
$data->{'StopSignal'} = $object->getStopSignal();
@@ -245,11 +253,11 @@ public function normalize($object, $format = null, array $context = [])
245253
$data->{'StopTimeout'} = $object->getStopTimeout();
246254
}
247255
if (null !== $object->getShell()) {
248-
$values_6 = [];
249-
foreach ($object->getShell() as $value_6) {
250-
$values_6[] = $value_6;
256+
$values_7 = [];
257+
foreach ($object->getShell() as $value_7) {
258+
$values_7[] = $value_7;
251259
}
252-
$data->{'Shell'} = $values_6;
260+
$data->{'Shell'} = $values_7;
253261
}
254262

255263
return $data;

Diff for: ‎src/Normalizer/ContainerConfigVolumesNormalizer.php

-57
This file was deleted.

0 commit comments

Comments
 (0)