Unverified Commit b259955a authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Fix linux builds (#62) 



* Fix linux builds

* Remove context

* Upgrade ci

* Added gcc in slim image

* Added zlib1g-dev

* Fix rules

---------

Co-authored-by: default avatarFedor Batonogov <f.batonogov@yandex.ru>
parent 26e67a72

.github/workflows/CI_LINUX.yml

+1 −2
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ jobs: 
        name: Build and push

        uses: docker/build-push-action@v5

        with:

          context: .

          file: Dockerfile-py3-linux

          file: ./Dockerfile-py3-linux

          platforms: |

            linux/i386

            linux/amd64

.github/workflows/CI_LINUX_SLIM.yml

+1 −2
Original line number Diff line number Diff line
@@ -24,8 +24,7 @@ jobs: 
        name: Build and push

        uses: docker/build-push-action@v5

        with:

          context: .

          file: Dockerfile-py3-linux-slim

          file: ./Dockerfile-py3-linux-slim

          platforms: |

            linux/i386

            linux/amd64

.github/workflows/CI_OSX.yml

+16 −35
Original line number Diff line number Diff line 
name: CI OSX

name: ci osx



on:

  push:

    tags: [ 'v*.*.*' ]



env:

  DOCKERFILE: Dockerfile-py3-osx



jobs:

  build_and_push_to_registry:

    name: Push Docker image to Docker Hub

  docker:

    runs-on: ubuntu-latest

    steps:

      - name: Check out the repo

        uses: actions/checkout@v3



      - name: Log in to Docker Hub

        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9

      -

        name: Set up QEMU

        uses: docker/setup-qemu-action@v3

      -

        name: Set up Docker Buildx

        uses: docker/setup-buildx-action@v3

      -

        name: Login to Docker Hub

        uses: docker/login-action@v3

        with:

          username: ${{ secrets.DOCKERHUB_USERNAME }}

          password: ${{ secrets.DOCKERHUB_TOKEN }}



      - name: Extract metadata (tags, labels) for Docker

        id: meta

        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38

        with:

          images: ${{ secrets.DOCKERHUB_USERNAME }}/pyinstaller-osx



      - name: Build and push Docker image (branch)

        uses: docker/build-push-action@v3

        with:

          context: .

          file: ${{ env.DOCKERFILE }}

          push: true

          tags: |

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

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



      - name: Build and push Docker image (release)

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

        uses: docker/build-push-action@v3

      -

        name: Build and push

        uses: docker/build-push-action@v5

        with:

          context: .

          file: ./Dockerfile-py3-osx

          platforms: |

            linux/amd64

          file: ${{ env.DOCKERFILE }}

          push: true

          tags: |

            ${{ github.ref_name }}"

            ${{ secrets.DOCKERHUB_USERNAME }}/pyinstaller-osx:${{ github.ref_name }}

            ${{ secrets.DOCKERHUB_USERNAME }}/pyinstaller-osx:latest
 
          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/CI_WINDOWS.yml

+16 −35
Original line number Diff line number Diff line 
name: CI WINDOWS

name: ci windows



on:

  push:

    tags: [ 'v*.*.*' ]



env:

  DOCKERFILE: Dockerfile-py3-windows



jobs:

  build_and_push_to_registry:

    name: Push Docker image to Docker Hub

  docker:

    runs-on: ubuntu-latest

    steps:

      - name: Check out the repo

        uses: actions/checkout@v3



      - name: Log in to Docker Hub

        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9

      -

        name: Set up QEMU

        uses: docker/setup-qemu-action@v3

      -

        name: Set up Docker Buildx

        uses: docker/setup-buildx-action@v3

      -

        name: Login to Docker Hub

        uses: docker/login-action@v3

        with:

          username: ${{ secrets.DOCKERHUB_USERNAME }}

          password: ${{ secrets.DOCKERHUB_TOKEN }}



      - name: Extract metadata (tags, labels) for Docker

        id: meta

        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38

        with:

          images: ${{ secrets.DOCKERHUB_USERNAME }}/pyinstaller-windows



      - name: Build and push Docker image (branch)

        uses: docker/build-push-action@v3

        with:

          context: .

          file: ${{ env.DOCKERFILE }}

          push: true

          tags: |

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

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



      - name: Build and push Docker image (release)

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

        uses: docker/build-push-action@v3

      -

        name: Build and push

        uses: docker/build-push-action@v5

        with:

          context: .

          file: ./Dockerfile-py3-windows

          platforms: |

            linux/amd64

          file: ${{ env.DOCKERFILE }}

          push: true

          tags: |

            ${{ github.ref_name }}"

            ${{ secrets.DOCKERHUB_USERNAME }}/pyinstaller-windows:${{ github.ref_name }}

            ${{ secrets.DOCKERHUB_USERNAME }}/pyinstaller-windows:latest
 
          labels: ${{ steps.meta.outputs.labels }}

Dockerfile-py3-linux-slim

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ COPY entrypoint-linux.sh /entrypoint.sh 
RUN apt update \

    && apt install -y \

        binutils \

        gcc \

        zlib1g-dev \

    && rm -rf /var/lib/apt/lists/* \

    && pip3 install \

        pyinstaller==$PYINSTALLER_VERSION \