Skip to content

Commit a636133

Browse files
authored
Merge pull request #94 from StackStorm/feature/xenial-py3.6
Add python 3.6 from PPA for Ubuntu Xenial
2 parents 229b7c1 + 45b3a07 commit a636133

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

packagingbuild/xenial/Dockerfile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN sed -ri 's/^session\s+required\s+pam_loginuid.so$/session optional pam_login
2929
RUN echo -e "#!/bin/sh\nexit 101\n" > /usr/sbin/policy-rc.d && \
3030
apt-get -y update && \
3131
apt-get -y install gdebi-core sshpass cron \
32-
netcat net-tools
32+
netcat net-tools software-properties-common
3333

3434
#
3535
# Buildenv is special environment for generating debian packages. It provides:
@@ -38,22 +38,24 @@ RUN echo -e "#!/bin/sh\nexit 101\n" > /usr/sbin/policy-rc.d && \
3838
#
3939

4040

41-
# install python development
42-
RUN apt-get update && \
43-
apt-get -y install build-essential python-dev python python-virtualenv
41+
# Install python 3.6 & development
42+
# from the PPA as it's not available in base distro
43+
RUN add-apt-repository -y ppa:deadsnakes/ppa && \
44+
apt-get update && \
45+
apt-get -y install build-essential python3.6-dev python3.6
4446

4547

4648
RUN apt-get update && \
4749
apt-get -y install \
4850
devscripts debhelper dh-make libldap2-dev libsasl2-dev && apt-get clean
4951

5052
# Install fresh pip and co
51-
RUN curl https://bootstrap.pypa.io/get-pip.py | python - virtualenv==16.6.0 pip==19.1.1 wheel setuptools; \
52-
pip install --upgrade requests[security] && rm -rf /root/.cache
53+
RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 - virtualenv==16.6.0 pip==19.1.1 wheel setuptools; \
54+
pip3.6 install --upgrade requests[security] && rm -rf /root/.cache
5355

5456
# We use our dh-virtualenv version, since it fixes shebangd lines rewrites
5557
RUN apt-get -y install \
56-
python-setuptools python-mock && \
58+
python-virtualenv python-setuptools python-mock && \
5759
apt-get clean && \
5860
git clone -b stackstorm_patched https://github.com/stackstorm/dh-virtualenv.git /tmp/dh-virtualenv && \
5961
cd /tmp/dh-virtualenv && \

0 commit comments

Comments
 (0)