This option was never functional, and was not intended
to be added to the "container create" API, so let's
remove it, because it has been removed in Docker 17.05,
and was broken in versions before that; see
- https://github.com/moby/moby/issues/32355 --init-path does not seem to work
- https://github.com/moby/moby/pull/32470 remove --init-path from client
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The `lstrip` and `rstrip` functions take a set of characters to remove, not a
prefix/suffix. Thus `rstrip('-x86_64')` will remove any trailing characters in
the string `'-x86_64'` in any order (in effect it strips the suffix matching
the regex `[-_x468]*`). So with `18.09.4` it removes the `4` suffix resulting
in trying to `int('')` later on:
Traceback (most recent call last):
File "/src/scripts/versions.py", line 80, in <module>
main()
File "/src/scripts/versions.py", line 73, in main
versions, reverse=True, key=operator.attrgetter('order')
File "/src/scripts/versions.py", line 52, in order
return (int(self.major), int(self.minor), int(self.patch)) + stage
ValueError: invalid literal for int() with base 10: ''
Since we no longer need to check for the arch suffix (since it no longer
appears in the URLs we are traversing) we could just drop the `rstrip` and
invent a local prefix stripping helper to replace `lstrip('docker-')`. Instead
lets take advantage of the behaviour of `re.findall` which is that if the regex
contains a single `()` match that will be returned. This lets us match exactly
the sub-section of the regex we require.
While editing the regex, also ensure that the suffix is precisely `.tgz` and
not merely `tgz` by adding an explicit `\.`, previously the literal `.` would
be swallowed by the `.*` instead.
Signed-off-by: Ian Campbell <ijc@docker.com>
The `lstrip` and `rstrip` functions take a set of characters to remove, not a
prefix/suffix. Thus `rstrip('-x86_64')` will remove any trailing characters in
the string `'-x86_64'` in any order (in effect it strips the suffix matching
the regex `[-_x468]*`). So with `18.09.4` it removes the `4` suffix resulting
in trying to `int('')` later on:
Traceback (most recent call last):
File "/src/scripts/versions.py", line 80, in <module>
main()
File "/src/scripts/versions.py", line 73, in main
versions, reverse=True, key=operator.attrgetter('order')
File "/src/scripts/versions.py", line 52, in order
return (int(self.major), int(self.minor), int(self.patch)) + stage
ValueError: invalid literal for int() with base 10: ''
Since we no longer need to check for the arch suffix (since it no longer
appears in the URLs we are traversing) we could just drop the `rstrip` and
invent a local prefix stripping helper to replace `lstrip('docker-')`. Instead
lets take advantage of the behaviour of `re.findall` which is that if the regex
contains a single `()` match that will be returned. This lets us match exactly
the sub-section of the regex we require.
While editing the regex, also ensure that the suffix is precisely `.tgz` and
not merely `tgz` by adding an explicit `\.`, previously the literal `.` would
be swallowed by the `.*` instead.
Signed-off-by: Ian Campbell <ijc@docker.com>
This fix lets the responsability of changing the
protocol to `parse_host` afterwards, letting
`base_url` with the original value.
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
This fix lets the responsability of changing the
protocol to `parse_host` afterwards, letting
`base_url` with the original value.
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
- Add a sleep of 2 seconds to be sure the logs
can be requested before the daemon removes the
container when run with auto_remove=True
Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
The integration tests require restarting the swarm once for each
test. I had done so manually with self.init_swarm(force_new_cluster=True)
but that wasn't resetting the swarm state correctly. The usual
test teardown procedure cleans up correctly.
Signed-off-by: Barry Shapira <barry@whiterabbit.ai>
Joffrey F
Hannes Ljungberg
Joffrey F
Adam Dangoor
Sebastiaan van Stijn
Chris Crone
Ulysses Souza
Ian Campbell
Karl Kuehn
Ian Campbell
Barry Shapira