Commit 7e365859 authored by Fedor Batonogov's avatar Fedor Batonogov
Browse files

Merge branch 'dev'

parents d3a9791d 6fd2554d

Dockerfile-py3-win32

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

FROM ubuntu:20.04



LABEL maintainer="batonogov@icloud.com"



ENV DEBIAN_FRONTEND noninteractive



ARG WINE_VERSION=winehq-stable

ARG PYTHON_VERSION=3.9.5

ARG PYINSTALLER_VERSION=4.2

ARG PYTHON_VERSION=3.9.7

ARG PYINSTALLER_VERSION=4.5.1



# 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

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

FROM ubuntu:20.04



LABEL maintainer="batonogov@icloud.com"



ENV DEBIAN_FRONTEND noninteractive



ARG WINE_VERSION=winehq-stable

ARG PYTHON_VERSION=3.9.5

ARG PYINSTALLER_VERSION=4.2

ARG PYTHON_VERSION=3.9.7

ARG PYINSTALLER_VERSION=4.5.1



# 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

+14 −9
Original line number Diff line number Diff line
@@ -3,14 +3,14 @@ 
**batonogov/pyinstaller-linux** and **batonogov/pyinstaller-windows** are a pair of Docker containers to ease compiling Python applications to binaries / exe files.



Current PyInstaller version used: 

- 4.2 for Python 3.9 

- 4.5.1 for Python 3.9.7

- 3.6 for Python 2.7



## Tags



`batonogov/pyinstaller-linux` and `batonogov/pyinstaller-windows` both have two tags, `:python3` and `:python2` which you can use depending on the requirements of your project. `:latest` points to `:python3`



The `:python3` tag runs Python 3.9.

The `:python3` tag runs Python 3.9.7.



The `:python2` tags run Python 2.7.
@@ -97,17 +97,22 @@ 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-09-24

- Update Ubuntu 16:04 -> 20:04 for win64 and win32

- Updated PyInstaller 4.2 -> 4.5.1

- Updated Python 3.9.5 -> 3.9.7



## License