Commit 89011885 authored by Fedor Batonogov's avatar Fedor Batonogov
Browse files

Update Ubuntu 16:04 -> 20:04

parent 05feb5b6

Dockerfile-py3-win32

+6 −6
Original line number Diff line number Diff line 
FROM ubuntu:16.04

FROM ubuntu:20.04



LABEL maintainer="batonogov@icloud.com"
@@ -11,14 +11,14 @@ 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 update -qy \

    && apt install --no-install-recommends -qfy apt-transport-https software-properties-common wget 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/' \

    && apt-get update -qy \

    && apt-get install --no-install-recommends -qfy $WINE_VERSION winbind cabextract \

    && apt-get clean \

    && apt update -qy \

    && apt install --no-install-recommends -qfy $WINE_VERSION winbind cabextract \

    && apt clean \

    && wget -nv https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \

    && chmod +x winetricks \

    && mv winetricks /usr/local/bin

Dockerfile-py3-win64

+6 −6
Original line number Diff line number Diff line 
FROM ubuntu:16.04

FROM ubuntu:20.04



LABEL maintainer="batonogov@icloud.com"
@@ -11,14 +11,14 @@ 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 update -qy \

    && apt install --no-install-recommends -qfy apt-transport-https software-properties-common wget 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/' \

    && apt-get update -qy \

    && apt-get install --no-install-recommends -qfy $WINE_VERSION winbind cabextract \

    && apt-get clean \

    && apt update -qy \

    && apt install --no-install-recommends -qfy $WINE_VERSION winbind cabextract \

    && apt clean \

    && wget -nv https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \

    && chmod +x winetricks \

    && mv winetricks /usr/local/bin

README.md

+10 −7
Original line number Diff line number Diff line
@@ -97,17 +97,20 @@ Added Python 3.6 on Windows, thanks to @jameshilliard 
Bumped Python version to 3.6 on Linux, thank you @itouch5000



#### [1.8] - 2019-01-15

Build using an older version of glibc to improve compatibility, thank you @itouch5000

Updated PyInstaller to version 3.4

- Build using an older version of glibc to improve compatibility, thank you @itouch5000

- Updated PyInstaller to version 3.4



#### [1.9] - 2020-01-14

Added a 32bit package, thank you @danielguardicore

Updated PyInstaller to version 3.6

- Added a 32bit package, thank you @danielguardicore

- Updated PyInstaller to version 3.6



#### [2.0] - 2021-03-11

Drop support for Python 2.7

Updated Python 3 to version 3.9

Updated PyInstaller to version 4.2

- Drop support for Python 2.7

- Updated Python 3 to version 3.9

- Updated PyInstaller to version 4.2



#### [2.1] - 2021-04-23

- Update Ubuntu 16:04 -> 20:04



## License