Merge pull request #3847 from werf/fix_python_warning

fix(stapel): disable python 2 deprecation warning in ansible builder
werf · Oct 18, 2021 · d5fbad5 · d5fbad5
2 parents 4bfba02 + 00d9834
commit d5fbad5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkg/stapel/stapel.go b/pkg/stapel/stapel.go
@@ -12,7 +12,7 @@ import (
 	"github.com/werf/werf/pkg/docker"
 )
 
-const VERSION = "0.7.0"
+const VERSION = "0.7.1"
 const IMAGE = "ghcr.io/werf/stapel"
 
 func getVersion() string {

diff --git a/stapel/Dockerfile b/stapel/Dockerfile
@@ -596,6 +596,8 @@ mv /tmp/UNICODE.so $TOOLS/lib/gconv
 
 RUN find $TOOLS/embedded/lib/python2.7 -name *.py[oc] | xargs rm
 
+RUN sed -i -e 's|if sys.version_info\[0\] == 2:|if False:|g' $TOOLS/embedded/lib/python2.7/site-packages/cryptography/__init__.py
+
 RUN mkdir /tmp/bin && \
 cp $TOOLS/bin/gpg* /tmp/bin && \
 cp $TOOLS/bin/gnutls* /tmp/bin && \