From 7e756b81d2719d98f1bb823bec3c726c840fb255 Mon Sep 17 00:00:00 2001 From: armab Date: Fri, 4 Dec 2020 14:28:40 +0000 Subject: [PATCH 1/4] Install python 3.6 from PPA for Ubuntu Xenial --- packagingbuild/xenial/Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packagingbuild/xenial/Dockerfile b/packagingbuild/xenial/Dockerfile index fcd2a5b..0e16978 100644 --- a/packagingbuild/xenial/Dockerfile +++ b/packagingbuild/xenial/Dockerfile @@ -38,9 +38,11 @@ RUN echo -e "#!/bin/sh\nexit 101\n" > /usr/sbin/policy-rc.d && \ # -# install python development -RUN apt-get update && \ - apt-get -y install build-essential python-dev python python-virtualenv +# Install python 3.6 & development +# from the PPA as it's not available in base distro +RUN sudo add-apt-repository ppa:deadsnakes/ppa && \ + apt-get update && \ + apt-get -y install build-essential python3.6-dev python3.6 RUN apt-get update && \ @@ -48,8 +50,8 @@ RUN apt-get update && \ devscripts debhelper dh-make libldap2-dev libsasl2-dev && apt-get clean # Install fresh pip and co -RUN curl https://bootstrap.pypa.io/get-pip.py | python - virtualenv==16.6.0 pip==19.1.1 wheel setuptools; \ - pip install --upgrade requests[security] && rm -rf /root/.cache +RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 - virtualenv==16.6.0 pip==19.1.1 wheel setuptools; \ + pip3.6 install --upgrade requests[security] && rm -rf /root/.cache # We use our dh-virtualenv version, since it fixes shebangd lines rewrites RUN apt-get -y install \ From d38d7b211bf4bb55a3cea03fbf9c71ad6fba1221 Mon Sep 17 00:00:00 2001 From: armab Date: Fri, 4 Dec 2020 21:14:31 +0000 Subject: [PATCH 2/4] Fix 'add-apt-repository' for Xenial --- packagingbuild/xenial/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packagingbuild/xenial/Dockerfile b/packagingbuild/xenial/Dockerfile index 0e16978..264cafa 100644 --- a/packagingbuild/xenial/Dockerfile +++ b/packagingbuild/xenial/Dockerfile @@ -29,7 +29,7 @@ RUN sed -ri 's/^session\s+required\s+pam_loginuid.so$/session optional pam_login RUN echo -e "#!/bin/sh\nexit 101\n" > /usr/sbin/policy-rc.d && \ apt-get -y update && \ apt-get -y install gdebi-core sshpass cron \ - netcat net-tools + netcat net-tools software-properties-common # # Buildenv is special environment for generating debian packages. It provides: From 17779cf10a84524557b66b3ca316654ed5d43174 Mon Sep 17 00:00:00 2001 From: armab Date: Fri, 4 Dec 2020 22:20:50 +0000 Subject: [PATCH 3/4] Fix 'dh-virtualenv depends on virtualenv | python-virtualenv (>= 1.7)' --- packagingbuild/xenial/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packagingbuild/xenial/Dockerfile b/packagingbuild/xenial/Dockerfile index 264cafa..4b8d724 100644 --- a/packagingbuild/xenial/Dockerfile +++ b/packagingbuild/xenial/Dockerfile @@ -55,7 +55,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 - virtualenv==16.6.0 p # We use our dh-virtualenv version, since it fixes shebangd lines rewrites RUN apt-get -y install \ - python-setuptools python-mock && \ + python-virtualenv python-setuptools python-mock && \ apt-get clean && \ git clone -b stackstorm_patched https://github.com/stackstorm/dh-virtualenv.git /tmp/dh-virtualenv && \ cd /tmp/dh-virtualenv && \ From 45b3a079d1a0aff3b0cc8887303c7f205cbb500c Mon Sep 17 00:00:00 2001 From: Eugen Cusmaunsa Date: Mon, 7 Dec 2020 20:04:59 +0000 Subject: [PATCH 4/4] Remove unnecessary sudo from the packagingbuild/xenial/Dockerfile Co-authored-by: blag --- packagingbuild/xenial/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packagingbuild/xenial/Dockerfile b/packagingbuild/xenial/Dockerfile index 4b8d724..da7b596 100644 --- a/packagingbuild/xenial/Dockerfile +++ b/packagingbuild/xenial/Dockerfile @@ -40,7 +40,7 @@ RUN echo -e "#!/bin/sh\nexit 101\n" > /usr/sbin/policy-rc.d && \ # Install python 3.6 & development # from the PPA as it's not available in base distro -RUN sudo add-apt-repository ppa:deadsnakes/ppa && \ +RUN add-apt-repository -y ppa:deadsnakes/ppa && \ apt-get update && \ apt-get -y install build-essential python3.6-dev python3.6