Commit 197fdb7a authored by Fedor Batonogov's avatar Fedor Batonogov
Browse files

minor bugs fixed

parent aa956d44

.github/workflows/build_amd64.yml

+3 −2
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ on: 
      - 'master'



env:

  TEST_TAG: batonogov/pyinstaller-linux:test

  TAG: batonogov/pyinstaller-linux:latest

  FILE: Dockerfile-py3-amd64
@@ -34,12 +35,12 @@ jobs: 
        with:

          context: .

          load: true

          tags: ${{ env.TAG }}

          tags: ${{ env.TEST_TAG }}

          file: ${{ env.FILE }}

      -

        name: Test

        run: |

          docker run --rm -v "$(pwd)/test/:/src/" ${{ env.TAG }} "pyinstaller --onefile hello.py"

          docker run --rm -v "$(pwd)/test/:/src/" ${{ env.TEST_TAG }} "pyinstaller --onefile hello.py"

      -

        name: Build and push

        uses: docker/build-push-action@v3

.github/workflows/build_amd64_dev.yml

+3 −3
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ on: 
      - 'dev'



env:

  TEST_TAG: batonogov/pyinstaller-windows:test

  TAG: batonogov/pyinstaller-windows:dev

  FILE: Dockerfile-py3-win64

  TEST_TAG: batonogov/pyinstaller-linux:test

  TAG: batonogov/pyinstaller-linux:dev

  FILE: Dockerfile-py3-amd64



jobs:

  docker:

.github/workflows/build_win64.yml

+3 −2
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ on: 
      - 'master'



env:

  TEST_TAG: batonogov/pyinstaller-windows:test

  TAG: batonogov/pyinstaller-windows:latest

  FILE: Dockerfile-py3-win64
@@ -34,12 +35,12 @@ jobs: 
        with:

          context: .

          load: true

          tags: ${{ env.TAG }}

          tags: ${{ env.TEST_TAG }}

          file: ${{ env.FILE }}

      -

        name: Test

        run: |

          docker run --rm -v "$(pwd)/test/:/src/" ${{ env.TAG }} "pyinstaller --onefile hello.py"

          docker run --rm -v "$(pwd)/test/:/src/" ${{ env.TEST_TAG }} "pyinstaller --onefile hello.py"

      -

        name: Build and push

        uses: docker/build-push-action@v3

Dockerfile-py3-amd64

+1 −1
Original line number Diff line number Diff line 
FROM ubuntu:22.04

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



LABEL maintainer="batonogov@icloud.com"

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



ARG PYTHON_VERSION=3.10.7

ARG PYINSTALLER_VERSION=5.5.0

Dockerfile-py3-win64

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



LABEL maintainer="batonogov@icloud.com"

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



ENV DEBIAN_FRONTEND noninteractive