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

preparing for release

parent fcdf7a21

.github/workflows/build_i386.yml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
name: build_i386_dev



on:

  push:

    branches:

      - 'master'



jobs:

  docker:

    runs-on: ubuntu-latest

    steps:

      -

        name: Set up QEMU

        uses: docker/setup-qemu-action@v1

      -

        name: Set up Docker Buildx

        uses: docker/setup-buildx-action@v1

      -

        name: Login to DockerHub

        uses: docker/login-action@v1 

        with:

          username: ${{ secrets.DOCKERHUB_USERNAME }}

          password: ${{ secrets.DOCKERHUB_TOKEN }}

      -

        name: Build and push

        id: docker_build

        uses: docker/build-push-action@v2

        with:

          push: true

          tags: batonogov/pyinstaller-linux:i386

          file: Dockerfile-py3-i386

Dockerfile-py2-amd64

deleted100644 → 0
+0 −65
Original line number Diff line number Diff line 
FROM ubuntu:12.04

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



ARG PYTHON_VERSION=2.7.17

ARG PYINSTALLER_VERSION=3.6



ENV PYPI_URL=https://pypi.python.org/

ENV PYPI_INDEX_URL=https://pypi.python.org/simple

ENV PYENV_VERSION=${PYTHON_VERSION}



COPY entrypoint-linux.sh /entrypoint.sh



RUN \

    set -x \

    # update system

    && apt-get update \

    # install requirements

    && apt-get install -y --no-install-recommends \

        build-essential \

        ca-certificates \

        curl \

        wget \

        git \

        libbz2-dev \

        libreadline-dev \

        libsqlite3-dev \

        libssl-dev \

        zlib1g-dev \

        libffi-dev \

        #optional libraries

        libgdbm-dev \

        libgdbm3 \

        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 \

    && curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash \

    && echo 'eval "$(pyenv init -)"' >> ~/.bashrc \

    && source ~/.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 global $PYTHON_VERSION \

    && pip install --upgrade pip \

    # install pyinstaller

    && pip install pyinstaller==$PYINSTALLER_VERSION \

    && mkdir /src/ \

    && chmod +x /entrypoint.sh



VOLUME /src/

WORKDIR /src/



ENTRYPOINT ["/entrypoint.sh"]

Dockerfile-py2-win32

deleted100644 → 0
+0 −62
Original line number Diff line number Diff line 
FROM ubuntu:14.04



ENV DEBIAN_FRONTEND noninteractive



ARG WINE_VERSION=winehq-devel

ARG PYTHON_VERSION=2.7.12

ARG PYINSTALLER_VERSION=3.6



# 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 software-properties-common \

    && add-apt-repository ppa:wine/wine-builds \

    && apt-get update -qy \

    && apt-get install --no-install-recommends -qfy $WINE_VERSION winetricks wget \

    && apt-get clean



# wine settings

ENV WINEARCH win32

ENV WINEDEBUG fixme-all

ENV WINEPREFIX /wine



# PYPI repository location

ENV PYPI_URL=https://pypi.python.org/

# PYPI index location

ENV PYPI_INDEX_URL=https://pypi.python.org/simple



# install python inside wine

RUN set -x \

    && wget -nv https://www.python.org/ftp/python/$PYTHON_VERSION/python-$PYTHON_VERSION.msi \

    && wine msiexec /qn /a python-$PYTHON_VERSION.msi \

    && rm python-$PYTHON_VERSION.msi \

    && wget -nv https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi \

    && wine msiexec /qn /a VCForPython27.msi \

    && rm VCForPython27.msi \

    && sed -i 's/_windows_cert_stores = .*/_windows_cert_stores = ("ROOT",)/' "/wine/drive_c/Python27/Lib/ssl.py" \

    && echo 'wine '\''C:\Python27\python.exe'\'' "$@"' > /usr/bin/python \

    && echo 'wine '\''C:\Python27\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \

    && echo 'wine '\''C:\Python27\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \

    && echo 'wine '\''C:\Python27\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller \

    && chmod +x /usr/bin/* \

    && wget https://bootstrap.pypa.io/ez_setup.py -O - | /usr/bin/python \

    && /usr/bin/easy_install pip \

    && echo 'assoc .py=PythonScript' | wine cmd \

    && echo 'ftype PythonScript=c:\Python27\python.exe "%1" %*' | wine cmd \

    && while pgrep wineserver >/dev/null; do echo "Waiting for wineserver"; sleep 1; done \

    && rm -rf /tmp/.wine-*



# install pyinstaller

RUN /usr/bin/pip install pyinstaller==$PYINSTALLER_VERSION



# put the src folder inside wine

RUN mkdir /src/ && ln -s /src /wine/drive_c/src

VOLUME /src/

WORKDIR /wine/drive_c/src/

RUN mkdir -p /wine/drive_c/tmp



COPY entrypoint-windows.sh /entrypoint.sh

RUN chmod +x /entrypoint.sh



ENTRYPOINT ["/entrypoint.sh"]

Dockerfile-py3-amd64

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ RUN echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc \ 
# install python

RUN 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 global $PYTHON_VERSION \

    && echo 'export PATH=$PATH:$HOME/.pyenv/versions/3.9.7/bin/' >> ~/.bashrc

    && echo 'export PATH=$PATH:$HOME/.pyenv/versions/$PYTHON_VERSION/bin/' >> ~/.bashrc



# install pyinstaller

RUN pip install pyinstaller==$PYINSTALLER_VERSION \

Dockerfile-py3-i386

+22 −18
Original line number Diff line number Diff line 
FROM i386/ubuntu:12.04

FROM i386/ubuntu:20.04

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



LABEL maintainer="batonogov@icloud.com"
@@ -31,33 +31,37 @@ RUN \ 
        libffi-dev \

        #optional libraries

        libgdbm-dev \

        libgdbm3 \

        uuid-dev \

        # libgdbm3 \ # устанавливается только на ubuntu 12.04

        uuid-dev

        #upx

        upx \

        # upx \ # устанавливается только на ubuntu 12.04



# required because openSSL on Ubuntu 12.04 and 14.04 run out of support versions of OpenSSL

    && mkdir openssl \

RUN 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 \

    && wget https://www.openssl.org/source/openssl-1.1.1l.tar.gz \

    && tar -xzvf openssl-1.1.1l.tar.gz \

    && cd openssl-1.1.1l \

    && ./Configure linux-generic32 --prefix=$HOME/openssl --openssldir=$HOME/openssl shared zlib \

    && make \

    && make install \

    && make install



# install pyenv

    && echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc \

RUN echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc \

    && echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc \

    && source ~/.bashrc \

    && curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash \

    && echo 'eval "$(pyenv init -)"' >> ~/.bashrc \

    && source ~/.bashrc \

    && source ~/.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 \

RUN 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 global $PYTHON_VERSION \

    && pip install --upgrade pip \

    && echo 'export PATH=$PATH:$HOME/.pyenv/versions/$PYTHON_VERSION/bin/' >> ~/.bashrc



# install pyinstaller

    && pip install pyinstaller==$PYINSTALLER_VERSION \

RUN pip install pyinstaller==$PYINSTALLER_VERSION \

    && mkdir /src/ \

    && chmod +x /entrypoint.sh