Commit 5f2a44e7 authored by Fedor Batonogov's avatar Fedor Batonogov
Browse files

Merge branch 'latest' into dev

parents 7ea1d947 f878f5f7

.github/workflows/CI_LINUX.yml

+29 −6
Original line number Diff line number Diff line
@@ -3,13 +3,16 @@ name: CI LINUX 
on:

  push:

    branches:

      - '**'

      - '*'

      - '!main'

    tags:        

      - '*'



env:

  DOCKERFILE: Dockerfile-py3-linux

  IMAGE_NAME: batonogov/pyinstaller-linux



jobs:



  test:

    runs-on: ubuntu-latest

    steps:
@@ -38,17 +41,37 @@ jobs: 
        id: meta

        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38

        with:

          images: batonogov/pyinstaller-linux

          images: ${{ env.IMAGE_NAME }}



      - name: Set up Docker Buildx

        uses: docker/setup-buildx-action@v2



      - name: Build and push Docker image

      - name: Build and push Docker image (dev)

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

        uses: docker/build-push-action@v3

        with:

          context: .

          platforms: |

            linux/amd64

            linux/arm64

          file: ${{ env.DOCKERFILE }}

          push: true

          tags: |

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

            ${{ env.IMAGE_NAME }}:dev

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



      - name: Build and push Docker image (release)

        if: ${{ startsWith(github.ref, 'refs/tags/*') }}

        uses: docker/build-push-action@v3

        with:

          context: .

          # platforms: linux/amd64, linux/arm64

          platforms: |

            linux/amd64

            linux/arm64

          file: ${{ env.DOCKERFILE }}

          push: true

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

          tags: |

            ${{ github.ref_name }}"

            ${{ env.IMAGE_NAME }}:latest

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

.github/workflows/CI_WINDOWS.yml

+24 −4
Original line number Diff line number Diff line
@@ -3,13 +3,16 @@ name: CI WINDOWS 
on:

  push:

    branches:

      - '**'

      - '*'

      - '!main'

    tags:        

      - '*'



env:

  DOCKERFILE: Dockerfile-py3-windows

  IMAGE_NAME: batonogov/pyinstaller-windows



jobs:



  test:

    runs-on: ubuntu-latest

    steps:
@@ -38,7 +41,7 @@ jobs: 
        id: meta

        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38

        with:

          images: batonogov/pyinstaller-windows

          images: ${{ env.IMAGE_NAME }}



      - name: Build and push Docker image

        uses: docker/build-push-action@v3
@@ -46,5 +49,22 @@ jobs: 
          context: .

          file: ${{ env.DOCKERFILE }}

          push: true

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

          tags: |

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

            ${{ env.IMAGE_NAME }}:dev

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



      - name: Build and push Docker image (release)

        if: ${{ startsWith(github.ref, 'refs/tags/*') }}

        uses: docker/build-push-action@v3

        with:

          context: .

          platforms: |

            linux/amd64

            linux/arm64

          file: ${{ env.DOCKERFILE }}

          push: true

          tags: |

            ${{ github.ref_name }}"

            ${{ env.IMAGE_NAME }}:latest

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

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -162,3 +162,4 @@ cython_debug/ 
# Other

.DS_Store

.fleet

.vscode

README.md

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ Replace `wget` with the dependencies / package(s) you need to install. 


##### How do I generate a .spec file?



`docker run -v "$(pwd):/src/" batonogov/pyinstaller-linux "pyinstaller your-script.py"`

`docker run -v "$(pwd):/src/" batonogov/pyinstaller-linux "pyinstaller --onefile your-script.py"`



will generate a `spec` file for `your-script.py` in your current working directory. See the PyInstaller docs for more information.