Skip to content

Commit

Permalink
Merge pull request #1066 from consideRatio/pr/fix-depdency-issues
Browse files Browse the repository at this point in the history
Workaround docker-py dependency's failure to import six
  • Loading branch information
manics authored Jul 28, 2021
2 parents 43891a6 + f3906be commit efc37c4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ RUN mkdir /tmp/wheelhouse \
&& cd /tmp/wheelhouse \
&& pip3 install wheel \
&& pip3 wheel --no-cache-dir /tmp/src \
&& rm /tmp/wheelhouse/six*.whl \
&& ls -l /tmp/wheelhouse

FROM alpine:${ALPINE_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def get_identifier(json):
version=versioneer.get_version(),
install_requires=[
"chardet",
"docker",
"docker!=5.0.0",
"entrypoints",
"escapism",
"iso8601",
Expand Down

0 comments on commit efc37c4

Please sign in to comment.