Unverified Commit e105454a authored by Fedor Batonogov's avatar Fedor Batonogov Committed by GitHub
Browse files

Preparing for release (#10) 

Updated Python 3.11.1 -> 3.11.2
Updated Ubuntu 20.04 -> 22.04 for windows
Updated Pyintaller 5.7.0 -> 5.8.0
parent 568b0a6c

.github/workflows/CI_LINUX.yml

+1 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ jobs: 
      - name: Set up Docker Buildx

        uses: docker/setup-buildx-action@v2



      - name: Build and push Docker image (dev)

      - name: Build and push Docker image (branch)

        if: github.ref != 'refs/heads/main'

        uses: docker/build-push-action@v3

        with:
@@ -58,7 +58,6 @@ jobs: 
          push: true

          tags: |

            ${{ steps.meta.outputs.tags }} 

            ${{ env.IMAGE_NAME }}:dev

          labels: ${{ steps.meta.outputs.labels }}



      - name: Build and push Docker image (release)

.github/workflows/CI_WINDOWS.yml

+1 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ jobs: 
        with:

          images: ${{ env.IMAGE_NAME }}



      - name: Build and push Docker image

      - name: Build and push Docker image (branch)

        uses: docker/build-push-action@v3

        with:

          context: .
@@ -51,7 +51,6 @@ jobs: 
          push: true

          tags: |

            ${{ steps.meta.outputs.tags }} 

            ${{ env.IMAGE_NAME }}:dev

          labels: ${{ steps.meta.outputs.labels }}



      - name: Build and push Docker image (release)
@@ -61,7 +60,6 @@ jobs: 
          context: .

          platforms: |

            linux/amd64

            linux/arm64

          file: ${{ env.DOCKERFILE }}

          push: true

          tags: |

Dockerfile-py3-linux

+11 −11
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ SHELL ["/bin/bash", "-i", "-c"] 


LABEL maintainer="f.batonogov@yandex.ru"



ARG PYTHON_VERSION=3.11.1

ARG PYINSTALLER_VERSION=5.7.0

ARG PYTHON_VERSION=3.11.2

ARG PYINSTALLER_VERSION=5.8.0



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

ENV PYPI_INDEX_URL=https://pypi.python.org/simple
@@ -37,15 +37,15 @@ RUN \ 
        xz-utils



# install python

RUN mkdir python && \

    cd python && \

    wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz && \

    tar xf Python-${PYTHON_VERSION}.tar.xz && \

    rm Python-${PYTHON_VERSION}.tar.xz && \

    cd Python-${PYTHON_VERSION} && \

    ./configure --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib" && \

    make && \

    make install

RUN mkdir python \

    && cd python \

    && wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz \

    && tar xf Python-${PYTHON_VERSION}.tar.xz \

    && rm Python-${PYTHON_VERSION}.tar.xz \

    && cd Python-${PYTHON_VERSION} \

    && ./configure --enable-shared LDFLAGS="-Wl,-rpath /usr/local/lib" \

    && make \

    && make install



# install pyinstaller

RUN pip3 install pyinstaller==$PYINSTALLER_VERSION

Dockerfile-py3-windows

+3 −3
Original line number Diff line number Diff line 
FROM ubuntu:20.04

FROM ubuntu:22.04



LABEL maintainer="f.batonogov@yandex.ru"



ENV DEBIAN_FRONTEND noninteractive



ARG WINE_VERSION=winehq-stable

ARG PYTHON_VERSION=3.11.1

ARG PYINSTALLER_VERSION=5.7.0

ARG PYTHON_VERSION=3.11.2

ARG PYINSTALLER_VERSION=5.8.0



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

RUN set -x \

LICENSE

+1 −0
Original line number Diff line number Diff line 
MIT License



Copyright (c) 2016 Chris R

Copyright (c) 2021 Fedor Batonogov



Permission is hereby granted, free of charge, to any person obtaining a copy

of this software and associated documentation files (the "Software"), to deal