From 4913c7bf897ba55870b3633296b9bdf13ac19f8f Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Tue, 10 Aug 2021 22:44:57 +0200
Subject: [PATCH 1/8] Update py3 amd64 to 20.04 lts, and some more dependencies

---
 Dockerfile-py3-amd64 | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/Dockerfile-py3-amd64 b/Dockerfile-py3-amd64
index d2ba86e..2bec073 100644
--- a/Dockerfile-py3-amd64
+++ b/Dockerfile-py3-amd64
@@ -1,8 +1,7 @@
-FROM ubuntu:12.04
-SHELL ["/bin/bash", "-i", "-c"]
+FROM ubuntu:20.04
 
-ARG PYTHON_VERSION=3.7.5
-ARG PYINSTALLER_VERSION=3.6
+ARG PYTHON_VERSION=3.9.6
+ARG PYINSTALLER_VERSION=4.2
 
 ENV PYPI_URL=https://pypi.python.org/
 ENV PYPI_INDEX_URL=https://pypi.python.org/simple
@@ -27,31 +26,23 @@ RUN \
         libssl-dev \
         zlib1g-dev \
         libffi-dev \
+        openssl \
         #optional libraries
         libgdbm-dev \
-        libgdbm3 \
+        libgdbm6 \
         uuid-dev \
         #upx
         upx \
-    # required because openSSL on Ubuntu 12.04 and 14.04 run out of support versions of OpenSSL
-    && mkdir openssl \
-    && cd openssl \
-    # latest version, there won't be anything newer for this
-    && wget https://www.openssl.org/source/openssl-1.0.2u.tar.gz \
-    && tar -xzvf openssl-1.0.2u.tar.gz \
-    && cd openssl-1.0.2u \
-    && ./config --prefix=$HOME/openssl --openssldir=$HOME/openssl shared zlib \
-    && make \
-    && make install \
     # install pyenv
     && echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc \
     && echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc \
-    && source ~/.bashrc \
+    && . ~/.bashrc \
     && curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash \
     && echo 'eval "$(pyenv init -)"' >> ~/.bashrc \
-    && source ~/.bashrc \
+    && echo 'eval "$(pyenv init --path)"' >> ~/.bashrc \
+    && . ~/.bashrc \
     # install python
-    && PATH="$HOME/openssl:$PATH"  CPPFLAGS="-O2 -I$HOME/openssl/include" CFLAGS="-I$HOME/openssl/include/" LDFLAGS="-L$HOME/openssl/lib -Wl,-rpath,$HOME/openssl/lib" LD_LIBRARY_PATH=$HOME/openssl/lib:$LD_LIBRARY_PATH LD_RUN_PATH="$HOME/openssl/lib" CONFIGURE_OPTS="--with-openssl=$HOME/openssl" PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_VERSION \
+    && CC=gcc CPPFLAGS="-O2" PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_VERSION \
     && pyenv global $PYTHON_VERSION \
     && pip install --upgrade pip \
     # install pyinstaller

From 0d678162ce2c40ea41b8aa164856695c509144fd Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Tue, 10 Aug 2021 22:52:27 +0200
Subject: [PATCH 2/8] update py3 win64 to 20.04 lts, and some more dependencies

---
 Dockerfile-py3-win64 | 39 ++++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/Dockerfile-py3-win64 b/Dockerfile-py3-win64
index e98284e..074f5a4 100644
--- a/Dockerfile-py3-win64
+++ b/Dockerfile-py3-win64
@@ -1,16 +1,16 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
 ARG WINE_VERSION=winehq-staging
-ARG PYTHON_VERSION=3.7.5
-ARG PYINSTALLER_VERSION=3.6
+ARG PYTHON_VERSION=3.9.6
+ARG PYINSTALLER_VERSION=4.2
 
 # we need wine for this all to work, so we'll use the PPA
 RUN set -x \
     && dpkg --add-architecture i386 \
     && apt-get update -qy \
-    && apt-get install --no-install-recommends -qfy apt-transport-https software-properties-common wget \
+    && apt-get install --no-install-recommends -qfy apt-transport-https software-properties-common wget xvfb xdotool x11-utils xterm gpg-agent rename \
     && wget -nv https://dl.winehq.org/wine-builds/winehq.key \
     && apt-key add winehq.key \
     && add-apt-repository 'https://dl.winehq.org/wine-builds/ubuntu/' \
@@ -26,6 +26,12 @@ ENV WINEARCH win64
 ENV WINEDEBUG fixme-all
 ENV WINEPREFIX /wine
 
+# xvfb settings
+# from https://github.com/engineervix/docker-pyinstaller/blob/b99163b6eb0a81fc9a0bfd498c09c4e0253d01b2/Dockerfile-py3-win64#L56-L59
+ENV DISPLAY :0
+RUN set -x \
+    && echo 'Xvfb $DISPLAY -screen 0 1024x768x24 &' >> /root/.bashrc
+
 # PYPI repository location
 ENV PYPI_URL=https://pypi.python.org/
 # PYPI index location
@@ -37,17 +43,17 @@ RUN set -x \
     && winetricks win7 \
     && for msifile in `echo core dev exe lib path pip tcltk tools`; do \
         wget -nv "https://www.python.org/ftp/python/$PYTHON_VERSION/amd64/${msifile}.msi"; \
-        wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python37; \
+        wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python39; \
         rm ${msifile}.msi; \
     done \
-    && cd /wine/drive_c/Python37 \
-    && echo 'wine '\''C:\Python37\python.exe'\'' "$@"' > /usr/bin/python \
-    && echo 'wine '\''C:\Python37\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
-    && echo 'wine '\''C:\Python37\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
-    && echo 'wine '\''C:\Python37\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller \
-    && echo 'wine '\''C:\Python37\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
+    && cd /wine/drive_c/Python39 \
+    && echo 'wine '\''C:\Python39\python.exe'\'' "$@"' > /usr/bin/python \
+    && echo 'wine '\''C:\Python39\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
+    && echo 'wine '\''C:\Python39\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
+    && echo 'wine '\''C:\Python39\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller \
+    && echo 'wine '\''C:\Python39\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
     && echo 'assoc .py=PythonScript' | wine cmd \
-    && echo 'ftype PythonScript=c:\Python37\python.exe "%1" %*' | wine cmd \
+    && echo 'ftype PythonScript=c:\Python39\python.exe "%1" %*' | wine cmd \
     && while pgrep wineserver >/dev/null; do echo "Waiting for wineserver"; sleep 1; done \
     && chmod +x /usr/bin/python /usr/bin/easy_install /usr/bin/pip /usr/bin/pyinstaller /usr/bin/pyupdater \
     && (pip install -U pip || true) \
@@ -61,10 +67,13 @@ ENV W_TMP="$W_DRIVE_C/windows/temp/_$0"
 # install Microsoft Visual C++ Redistributable for Visual Studio 2017 dll files
 RUN set -x \
     && rm -f "$W_TMP"/* \
-    && wget -P "$W_TMP" https://download.visualstudio.microsoft.com/download/pr/11100230/15ccb3f02745c7b206ad10373cbca89b/VC_redist.x64.exe \
-    && cabextract -q --directory="$W_TMP" "$W_TMP"/VC_redist.x64.exe \
-    && cabextract -q --directory="$W_TMP" "$W_TMP/a10" \
+    && wget -P "$W_TMP" https://aka.ms/vs/16/release/vc_redist.x64.exe \
+    # https://download.visualstudio.microsoft.com/download/pr/36e45907-8554-4390-ba70-9f6306924167/97CC5066EB3C7246CF89B735AE0F5A5304A7EE33DC087D65D9DFF3A1A73FE803/VC_redist.x64.exe
+    && ls "$W_TMP"/ \
+    && cabextract -q --directory="$W_TMP" "$W_TMP"/vc_redist.x64.exe \
     && cabextract -q --directory="$W_TMP" "$W_TMP/a11" \
+    && cabextract -q --directory="$W_TMP" "$W_TMP/a12" \
+    && cabextract -q --directory="$W_TMP" "$W_TMP/a13" \
     && cd "$W_TMP" \
     && rename 's/_/\-/g' *.dll \
     && cp "$W_TMP"/*.dll "$W_SYSTEM64_DLLS"/

From 213d0c99bc47bf643eeb168bd5c68c30f43a4eaf Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Thu, 12 Aug 2021 20:23:13 +0200
Subject: [PATCH 3/8] fix pyenv enable-shared, var was not detected by pyenv

---
 Dockerfile-py3-amd64 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Dockerfile-py3-amd64 b/Dockerfile-py3-amd64
index 2bec073..c74d584 100644
--- a/Dockerfile-py3-amd64
+++ b/Dockerfile-py3-amd64
@@ -7,6 +7,10 @@ ENV PYPI_URL=https://pypi.python.org/
 ENV PYPI_INDEX_URL=https://pypi.python.org/simple
 ENV PYENV_VERSION=${PYTHON_VERSION}
 
+# set compilation environment for python
+ENV PYTHON_CONFIGURE_OPTS=--enable-shared
+ENV CPPFLAGS=-O2
+
 COPY entrypoint-linux.sh /entrypoint.sh
 
 RUN \
@@ -42,7 +46,7 @@ RUN \
     && echo 'eval "$(pyenv init --path)"' >> ~/.bashrc \
     && . ~/.bashrc \
     # install python
-    && CC=gcc CPPFLAGS="-O2" PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_VERSION \
+    && pyenv install $PYTHON_VERSION \
     && pyenv global $PYTHON_VERSION \
     && pip install --upgrade pip \
     # install pyinstaller

From 681cf2ad742029f1e9264f7e01290862d6e9e628 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Thu, 12 Aug 2021 20:24:23 +0200
Subject: [PATCH 4/8] switch back to 18.04 for better glibc compatibility

---
 Dockerfile-py3-amd64 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile-py3-amd64 b/Dockerfile-py3-amd64
index c74d584..88d346d 100644
--- a/Dockerfile-py3-amd64
+++ b/Dockerfile-py3-amd64
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:18.04
 
 ARG PYTHON_VERSION=3.9.6
 ARG PYINSTALLER_VERSION=4.2
@@ -33,7 +33,9 @@ RUN \
         openssl \
         #optional libraries
         libgdbm-dev \
-        libgdbm6 \
+        # libgdbm5 for ubuntu 18.04
+        # libgdbm6 for ubuntu 20.04
+        libgdbm5 \
         uuid-dev \
         #upx
         upx \

From 75e42bce39d817ffb3ede2b82ff876a8cdd66dc4 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Thu, 12 Aug 2021 20:36:48 +0200
Subject: [PATCH 5/8] adjust i386

---
 Dockerfile-py3-i386 | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/Dockerfile-py3-i386 b/Dockerfile-py3-i386
index 414ee56..b3e9482 100644
--- a/Dockerfile-py3-i386
+++ b/Dockerfile-py3-i386
@@ -1,13 +1,16 @@
-FROM i386/ubuntu:12.04
-SHELL ["/bin/bash", "-i", "-c"]
+FROM i386/ubuntu:18.04
 
-ARG PYTHON_VERSION=3.7.5
-ARG PYINSTALLER_VERSION=3.6
+ARG PYTHON_VERSION=3.9.6
+ARG PYINSTALLER_VERSION=4.2
 
 ENV PYPI_URL=https://pypi.python.org/
 ENV PYPI_INDEX_URL=https://pypi.python.org/simple
 ENV PYENV_VERSION=${PYTHON_VERSION}
 
+# set compilation environment for python
+ENV PYTHON_CONFIGURE_OPTS=--enable-shared
+ENV CPPFLAGS=-O2
+
 COPY entrypoint-linux.sh /entrypoint.sh
 
 RUN \
@@ -27,31 +30,25 @@ RUN \
         libssl-dev \
         zlib1g-dev \
         libffi-dev \
+        openssl \
         #optional libraries
         libgdbm-dev \
-        libgdbm3 \
+        # libgdbm5 for ubuntu 18.04
+        # libgdbm6 for ubuntu 20.04
+        libgdbm5 \
         uuid-dev \
-        #upx
+        #upx # why is this needed?
         upx \
-    # required because openSSL on Ubuntu 12.04 and 14.04 run out of support versions of OpenSSL
-    && mkdir openssl \
-    && cd openssl \
-    # latest version, there won't be anything newer for this
-    && wget https://www.openssl.org/source/openssl-1.0.2u.tar.gz \
-    && tar -xzvf openssl-1.0.2u.tar.gz \
-    && cd openssl-1.0.2u \
-    && ./Configure linux-generic32 --prefix=$HOME/openssl --openssldir=$HOME/openssl shared zlib \
-    && make \
-    && make install \
     # install pyenv
     && echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc \
     && echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc \
-    && source ~/.bashrc \
+    && . ~/.bashrc \
     && curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash \
     && echo 'eval "$(pyenv init -)"' >> ~/.bashrc \
-    && source ~/.bashrc \
+    && echo 'eval "$(pyenv init --path)"' >> ~/.bashrc \
+    && . ~/.bashrc \
     # install python
-    && PATH="$HOME/openssl:$PATH"  CPPFLAGS="-O2 -I$HOME/openssl/include" CFLAGS="-I$HOME/openssl/include/" LDFLAGS="-L$HOME/openssl/lib -Wl,-rpath,$HOME/openssl/lib" LD_LIBRARY_PATH=$HOME/openssl/lib:$LD_LIBRARY_PATH LD_RUN_PATH="$HOME/openssl/lib" CONFIGURE_OPTS="--with-openssl=$HOME/openssl" PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_VERSION \
+    && pyenv install $PYTHON_VERSION \
     && pyenv global $PYTHON_VERSION \
     && pip install --upgrade pip \
     # install pyinstaller

From 20e0669dfdb7a9e1d6072f7c8fcd3e7e7b24261b Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Thu, 12 Aug 2021 20:46:07 +0200
Subject: [PATCH 6/8] adjust win32 file

---
 Dockerfile-py3-win32 | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/Dockerfile-py3-win32 b/Dockerfile-py3-win32
index 89787b0..8d238ff 100644
--- a/Dockerfile-py3-win32
+++ b/Dockerfile-py3-win32
@@ -1,16 +1,16 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND noninteractive
 
 ARG WINE_VERSION=winehq-staging
-ARG PYTHON_VERSION=3.7.5
-ARG PYINSTALLER_VERSION=3.6
+ARG PYTHON_VERSION=3.9.6
+ARG PYINSTALLER_VERSION=4.2
 
 # we need wine for this all to work, so we'll use the PPA
 RUN set -x \
     && dpkg --add-architecture i386 \
     && apt-get update -qy \
-    && apt-get install --no-install-recommends -qfy apt-transport-https software-properties-common wget \
+    && apt-get install --no-install-recommends -qfy apt-transport-https software-properties-common wget xvfb xdotool x11-utils xterm gpg-agent rename \
     && wget -nv https://dl.winehq.org/wine-builds/winehq.key \
     && apt-key add winehq.key \
     && add-apt-repository 'https://dl.winehq.org/wine-builds/ubuntu/' \
@@ -26,6 +26,12 @@ ENV WINEARCH win32
 ENV WINEDEBUG fixme-all
 ENV WINEPREFIX /wine
 
+# xvfb settings
+# from https://github.com/engineervix/docker-pyinstaller/blob/b99163b6eb0a81fc9a0bfd498c09c4e0253d01b2/Dockerfile-py3-win64#L56-L59
+ENV DISPLAY :0
+RUN set -x \
+    && echo 'Xvfb $DISPLAY -screen 0 1024x768x24 &' >> /root/.bashrc
+
 # PYPI repository location
 ENV PYPI_URL=https://pypi.python.org/
 # PYPI index location
@@ -37,17 +43,17 @@ RUN set -x \
     && winetricks win7 \
     && for msifile in `echo core dev exe lib path pip tcltk tools`; do \
         wget -nv "https://www.python.org/ftp/python/$PYTHON_VERSION/win32/${msifile}.msi"; \
-        wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python37; \
+        wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python39; \
         rm ${msifile}.msi; \
     done \
-    && cd /wine/drive_c/Python37 \
-    && echo 'wine '\''C:\Python37\python.exe'\'' "$@"' > /usr/bin/python \
-    && echo 'wine '\''C:\Python37\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
-    && echo 'wine '\''C:\Python37\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
-    && echo 'wine '\''C:\Python37\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller \
-    && echo 'wine '\''C:\Python37\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
+    && cd /wine/drive_c/Python39 \
+    && echo 'wine '\''C:\Python39\python.exe'\'' "$@"' > /usr/bin/python \
+    && echo 'wine '\''C:\Python39\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
+    && echo 'wine '\''C:\Python39\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
+    && echo 'wine '\''C:\Python39\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller \
+    && echo 'wine '\''C:\Python39\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
     && echo 'assoc .py=PythonScript' | wine cmd \
-    && echo 'ftype PythonScript=c:\Python37\python.exe "%1" %*' | wine cmd \
+    && echo 'ftype PythonScript=c:\Python39\python.exe "%1" %*' | wine cmd \
     && while pgrep wineserver >/dev/null; do echo "Waiting for wineserver"; sleep 1; done \
     && chmod +x /usr/bin/python /usr/bin/easy_install /usr/bin/pip /usr/bin/pyinstaller /usr/bin/pyupdater \
     && (pip install -U pip || true) \
@@ -61,7 +67,8 @@ ENV W_TMP="$W_DRIVE_C/windows/temp/_$0"
 # install Microsoft Visual C++ Redistributable for Visual Studio 2017 dll files
 RUN set -x \
     && rm -f "$W_TMP"/* \
-    && wget -P "$W_TMP" https://download.visualstudio.microsoft.com/download/pr/11687613/88b50ce70017bf10f2d56d60fcba6ab1/VC_redist.x86.exe \
+    && wget -P "$W_TMP" https://aka.ms/vs/16/release/vc_redist.x86.exe \
+    # https://download.visualstudio.microsoft.com/download/pr/221ed2ae-1269-497b-a962-e113045001fa/1ACD8D5EA1CDC3EB2EB4C87BE3AB28722D0825C15449E5C9CEEF95D897DE52FA/VC_redist.x86.exe
     && cabextract -q --directory="$W_TMP" "$W_TMP"/VC_redist.x86.exe \
     && cabextract -q --directory="$W_TMP" "$W_TMP/a10" \
     && cabextract -q --directory="$W_TMP" "$W_TMP/a11" \

From 69c33331ad180feee128d6dcb384c6c67c72ee8f Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Thu, 12 Aug 2021 20:50:11 +0200
Subject: [PATCH 7/8] change py2 images, don't know if they work

---
 Dockerfile-py2-amd64 | 29 +++++++++++++----------------
 Dockerfile-py2-win32 |  2 +-
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/Dockerfile-py2-amd64 b/Dockerfile-py2-amd64
index 6681f00..f82c1c7 100644
--- a/Dockerfile-py2-amd64
+++ b/Dockerfile-py2-amd64
@@ -1,5 +1,4 @@
-FROM ubuntu:12.04
-SHELL ["/bin/bash", "-i", "-c"]
+FROM ubuntu:18.04
 
 ARG PYTHON_VERSION=2.7.17
 ARG PYINSTALLER_VERSION=3.6
@@ -8,6 +7,10 @@ ENV PYPI_URL=https://pypi.python.org/
 ENV PYPI_INDEX_URL=https://pypi.python.org/simple
 ENV PYENV_VERSION=${PYTHON_VERSION}
 
+# set compilation environment for python
+ENV PYTHON_CONFIGURE_OPTS=--enable-shared
+ENV CPPFLAGS=-O2
+
 COPY entrypoint-linux.sh /entrypoint.sh
 
 RUN \
@@ -27,31 +30,25 @@ RUN \
         libssl-dev \
         zlib1g-dev \
         libffi-dev \
+        openssl \
         #optional libraries
         libgdbm-dev \
-        libgdbm3 \
+        # libgdbm5 for ubuntu 18.04
+        # libgdbm6 for ubuntu 20.04
+        libgdbm5 \
         uuid-dev \
         #upx
         upx \
-    # required because openSSL on Ubuntu 12.04 and 14.04 run out of support versions of OpenSSL
-    && mkdir openssl \
-    && cd openssl \
-    # latest version, there won't be anything newer for this
-    && wget https://www.openssl.org/source/openssl-1.0.2u.tar.gz \
-    && tar -xzvf openssl-1.0.2u.tar.gz \
-    && cd openssl-1.0.2u \
-    && ./config --prefix=$HOME/openssl --openssldir=$HOME/openssl shared zlib \
-    && make \
-    && make install \
     # install pyenv
     && echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc \
     && echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc \
-    && source ~/.bashrc \
+    && . ~/.bashrc \
     && curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash \
     && echo 'eval "$(pyenv init -)"' >> ~/.bashrc \
-    && source ~/.bashrc \
+    && echo 'eval "$(pyenv init --path)"' >> ~/.bashrc \
+    && . ~/.bashrc \
     # install python
-    && PATH="$HOME/openssl:$PATH"  CPPFLAGS="-O2 -I$HOME/openssl/include" CFLAGS="-I$HOME/openssl/include/" LDFLAGS="-L$HOME/openssl/lib -Wl,-rpath,$HOME/openssl/lib" LD_LIBRARY_PATH=$HOME/openssl/lib:$LD_LIBRARY_PATH LD_RUN_PATH="$HOME/openssl/lib" CONFIGURE_OPTS="--with-openssl=$HOME/openssl" PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install $PYTHON_VERSION \
+    && pyenv install $PYTHON_VERSION \
     && pyenv global $PYTHON_VERSION \
     && pip install --upgrade pip \
     # install pyinstaller
diff --git a/Dockerfile-py2-win32 b/Dockerfile-py2-win32
index 1738f8a..ef2fa77 100644
--- a/Dockerfile-py2-win32
+++ b/Dockerfile-py2-win32
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM ubuntu:20.04
 
 ENV DEBIAN_FRONTEND noninteractive
 

From 4c3000948f329592b72c558c9f5aca4755a8ffc3 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Thu, 12 Aug 2021 21:01:45 +0200
Subject: [PATCH 8/8] fix typo, VC -> vc

---
 Dockerfile-py3-win32 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile-py3-win32 b/Dockerfile-py3-win32
index 8d238ff..43a4af0 100644
--- a/Dockerfile-py3-win32
+++ b/Dockerfile-py3-win32
@@ -69,7 +69,7 @@ RUN set -x \
     && rm -f "$W_TMP"/* \
     && wget -P "$W_TMP" https://aka.ms/vs/16/release/vc_redist.x86.exe \
     # https://download.visualstudio.microsoft.com/download/pr/221ed2ae-1269-497b-a962-e113045001fa/1ACD8D5EA1CDC3EB2EB4C87BE3AB28722D0825C15449E5C9CEEF95D897DE52FA/VC_redist.x86.exe
-    && cabextract -q --directory="$W_TMP" "$W_TMP"/VC_redist.x86.exe \
+    && cabextract -q --directory="$W_TMP" "$W_TMP"/vc_redist.x86.exe \
     && cabextract -q --directory="$W_TMP" "$W_TMP/a10" \
     && cabextract -q --directory="$W_TMP" "$W_TMP/a11" \
     && cd "$W_TMP" \