Commit 98016b4b authored by cdrx's avatar cdrx
Browse files

Bumped PyInstaller version to 3.6

parent 9e411af8

Dockerfile-py2-amd64

0 → 100644
+65 −0
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-linux64

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



ENV DEBIAN_FRONTEND noninteractive



ARG PYINSTALLER_VERSION=3.5



# install python

RUN set -x \

    && apt-get update -qy \

    && apt-get install --no-install-recommends -qfy python python-dev python-pip python-setuptools build-essential libmysqlclient-dev git upx libgdbm-dev libgdbm3 uuid-dev \

    && apt-get clean



# PYPI repository location

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

# PYPI index location

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





# install pyinstaller

RUN pip install pyinstaller==$PYINSTALLER_VERSION



RUN mkdir /src/

VOLUME /src/

WORKDIR /src/



COPY entrypoint-linux.sh /entrypoint.sh

RUN chmod +x /entrypoint.sh



ENTRYPOINT ["/entrypoint.sh"]

Dockerfile-py2-win32

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ ENV DEBIAN_FRONTEND noninteractive 


ARG WINE_VERSION=winehq-devel

ARG PYTHON_VERSION=2.7.12

ARG PYINSTALLER_VERSION=3.3

ARG PYINSTALLER_VERSION=3.6



# we need wine for this all to work, so we'll use the PPA

RUN set -x \

Dockerfile-py3-linux64→Dockerfile-py3-amd64

+2 −2
Original line number Diff line number Diff line 
FROM amd64/ubuntu:12.04

FROM ubuntu:12.04

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



ARG PYTHON_VERSION=3.7.5

ARG PYINSTALLER_VERSION=3.5

ARG PYINSTALLER_VERSION=3.6



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

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

Dockerfile-py3-linux32→Dockerfile-py3-i386

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ FROM i386/ubuntu:12.04 
SHELL ["/bin/bash", "-i", "-c"]



ARG PYTHON_VERSION=3.7.5

ARG PYINSTALLER_VERSION=3.5

ARG PYINSTALLER_VERSION=3.6



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

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