Skip to content

Commit 231cf1c

Browse files
committed
fix: workaround docker==5.0.0 not importing its dependencies
1 parent 43891a6 commit 231cf1c

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ RUN mkdir /tmp/wheelhouse \
1111
&& cd /tmp/wheelhouse \
1212
&& pip3 install wheel \
1313
&& pip3 wheel --no-cache-dir /tmp/src \
14+
&& rm /tmp/wheelhouse/six*.whl \
1415
&& ls -l /tmp/wheelhouse
1516

1617
FROM alpine:${ALPINE_VERSION}

setup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ def get_identifier(json):
5757
"requests",
5858
"ruamel.yaml>=0.15",
5959
"semver",
60+
# six installation is a workaround of https://github.com/docker/docker-py/pull/2844.
61+
# When removing this, also remove the "rm /tmp/wheelhouse/six*.whl" line in ./Dockerfile
62+
"six",
6063
"toml",
6164
"traitlets",
6265
],

0 commit comments

Comments
 (0)