Skip to content

Commit

Permalink
Merge #512: Fix release builds docker container
Browse files Browse the repository at this point in the history
6f926e6 Revert bad to using Debian stretch for docker (Andrew Chow)
efb2e02 Also install qt5 in docker container (Andrew Chow)
873386f Update pyenv commands for new behavior (Andrew Chow)

Pull request description:

  Repairs the docker container used for release builds

  * Pyenv made some changes to how it is activated, update the pyenv commands to match those
  * Downgrade to Debian stretch to fix #506. Stretch uses an older glibc. Somehow this change does not reintroduce #480
  * Install `qt5-default` in the container. Pyinstaller now seems to be having some problems with missing libraries when qt5 is not installed.

ACKs for top commit:
  gruve-p:
    tACK 6f926e6

Tree-SHA512: b4a2cec9ed5595a14035de54817dd121dac195deb9b956205c8d83c6da441514d43f4c8134b3123730a0d9830f3fc3d584a9d485f79db78256572b7702d534e4
  • Loading branch information
achow101 committed May 27, 2021
2 parents f8da677 + 6f926e6 commit 560a48e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
13 changes: 8 additions & 5 deletions contrib/build.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:buster-slim
FROM debian:stretch-slim

SHELL ["/bin/bash", "-c"]

Expand Down Expand Up @@ -28,20 +28,23 @@ RUN apt-get install -y \
faketime \
zip \
dos2unix \
g++-mingw-w64-x86-64
g++-mingw-w64-x86-64 \
qt5-default

RUN curl https://pyenv.run | bash
ENV PATH="/root/.pyenv/bin:$PATH"
ENV PYENV_ROOT="/root/.pyenv"
ENV PATH="$PYENV_ROOT/bin:$PATH"

COPY contrib/reproducible-python.diff /opt/reproducible-python.diff
ENV PYTHON_CONFIGURE_OPTS="--enable-shared"
ENV BUILD_DATE="Jan 1 2019"
ENV BUILD_TIME="00:00:00"
RUN eval "$(pyenv init -)" && eval "$(pyenv virtualenv-init -)" && cat /opt/reproducible-python.diff | pyenv install -kp 3.6.12
RUN eval "$(pyenv init --path)" && eval "$(pyenv virtualenv-init -)" && cat /opt/reproducible-python.diff | pyenv install -kp 3.6.12

RUN dpkg --add-architecture i386
RUN wget -nc https://dl.winehq.org/wine-builds/winehq.key
RUN apt-key add winehq.key
RUN echo "deb https://dl.winehq.org/wine-builds/debian/ buster main" >> /etc/apt/sources.list
RUN echo "deb https://dl.winehq.org/wine-builds/debian/ stretch main" >> /etc/apt/sources.list
RUN apt-get update
RUN apt-get install --install-recommends -y \
wine-stable-amd64 \
Expand Down
2 changes: 1 addition & 1 deletion contrib/build_bin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

set -ex

eval "$(pyenv init -)"
eval "$(pyenv init --path)"
eval "$(pyenv virtualenv-init -)"
pip install -U pip
pip install poetry
Expand Down
2 changes: 1 addition & 1 deletion contrib/build_dist.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

set -ex

eval "$(pyenv init -)"
eval "$(pyenv init --path)"
eval "$(pyenv virtualenv-init -)"
pip install -U pip
pip install poetry
Expand Down

0 comments on commit 560a48e

Please sign in to comment.