Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bionicbuild image so we don't bundle two different pip version #104

Merged
merged 6 commits into from
Mar 5, 2021
Merged

Fix bionicbuild image so we don't bundle two different pip version #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4874d1e
Fix bionic build image so we don't have two pip - old system one and new
Kami Mar 4, 2021
1a78a41
Also cherry pick no system site packages dh virtualenv change from #98.
Kami Mar 4, 2021
bf8efda
Specify explicit pip version, use dh-virtualenv with more fixes neede…
Kami Mar 5, 2021
5ce15ad
Make sure python3-dev is installed on bionic.
Kami Mar 5, 2021
3c21c62
Dummy commit to trigger build.
Kami Mar 5, 2021
021c686
Add a workaround for temporary upstream apt timeouts.
Kami Mar 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions packagingbuild/bionic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,26 +37,24 @@ RUN echo -e "#!/bin/sh\nexit 101\n" > /usr/sbin/policy-rc.d && \
# - SSH access for build executor.
#


# install python development
RUN apt-get update && \
apt-get -y install build-essential \
python python-virtualenv \
python3 python3-virtualenv python3-pip
python3-dev python3

RUN apt-get update && \
apt-get -y install \
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 | python3 - virtualenv==16.6.0 pip==20.0.2 wheel setuptools cryptography; \
pip3 install --upgrade requests[security] && rm -rf /root/.cache
RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 - virtualenv==16.6.0 pip==20.0.2 wheel setuptools cryptography; \
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 \
python-setuptools python-mock && \
python-virtualenv python-setuptools python-mock && \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Curious - why the move of python-virtualenv to here from earlier?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was done to make Bionic Dockerfile more similar to the Xenial one.

In fact, first I made more changes so those Dockerfiles were almost the same (also added ppa for Python so we install same versions - right now on Xenial we install Python 3.6.12 and on Bionic we install Python 3.6.9, etc.), but then I decided to remove those changes to keep the diff smaller.

If people feel opinionated about it, I can add them back (they work fine as well).

apt-get clean && \
git clone -b stackstorm_patched https://github.com/stackstorm/dh-virtualenv.git /tmp/dh-virtualenv && \
git clone --branch stackstorm_patched_use_custom_pip https://github.com/StackStorm/dh-virtualenv.git /tmp/dh-virtualenv && \
cd /tmp/dh-virtualenv && \
dpkg-buildpackage -b -uc -us && dpkg -i ../dh-virtualenv_*.deb && \
rm -rf /tmp/dh-virtualenv*
Expand Down
5 changes: 4 additions & 1 deletion packagingbuild/xenial/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ RUN mkdir /root/.ssh && chmod 700 /root/.ssh && \
COPY busybee* /root/.ssh/
RUN chmod 600 /root/.ssh/busybee

# Temporary workaround to work around failing apt mirror for half a day already
RUN sed -i "s#deb.debian.org#ftp.si.debian.org#g" /etc/apt/sources.list

RUN apt-get -y update && \
apt-get install -y openssh-server sudo && \
mkdir /var/run/sshd
Expand Down Expand Up @@ -57,7 +60,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6 - virtualenv==16.6.0 p
RUN apt-get -y install \
python-virtualenv python-setuptools python-mock && \
apt-get clean && \
git clone -b stackstorm_patched https://github.com/stackstorm/dh-virtualenv.git /tmp/dh-virtualenv && \
git clone --branch stackstorm_patched_use_custom_pip https://github.com/StackStorm/dh-virtualenv.git /tmp/dh-virtualenv && \
cd /tmp/dh-virtualenv && \
dpkg-buildpackage -b -uc -us && dpkg -i ../dh-virtualenv_*.deb && \
rm -rf /tmp/dh-virtualenv*
Expand Down