fix keyring errors in exe produced by pyinstaller (and docker as it i…

…s uses the same exe) (#554) fixes #539
icloud-photos-downloader · Jan 29, 2023 · 75b9640 · 75b9640
1 parent a7f778c
commit 75b9640
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -63,20 +63,20 @@ jobs:
 
     - name: Build Release Executables (Windows)
       run: |
-        pyinstaller --onefile icloudpd.py --name icloudpd-${{needs.get_version.outputs.icloudpd_version}}-windows-amd64
-        pyinstaller --onefile icloud.py --name icloud-${{needs.get_version.outputs.icloudpd_version}}-windows-amd64
+        pyinstaller --collect-all keyrings.alt --hidden-import pkgutil --onefile icloudpd.py --name icloudpd-${{needs.get_version.outputs.icloudpd_version}}-windows-amd64
+        pyinstaller --collect-all keyrings.alt --hidden-import pkgutil --onefile icloud.py --name icloud-${{needs.get_version.outputs.icloudpd_version}}-windows-amd64
       if: ${{ matrix.os == 'windows-latest' }}
 
     - name: Build Release Executables (Linux)
       run: |
-        pyinstaller --onefile icloudpd.py --name icloudpd-${{needs.get_version.outputs.icloudpd_version}}-linux-amd64
-        pyinstaller --onefile icloud.py --name icloud-${{needs.get_version.outputs.icloudpd_version}}-linux-amd64
+        pyinstaller --collect-all keyrings.alt --hidden-import pkgutil --onefile icloudpd.py --name icloudpd-${{needs.get_version.outputs.icloudpd_version}}-linux-amd64
+        pyinstaller --collect-all keyrings.alt --hidden-import pkgutil --onefile icloud.py --name icloud-${{needs.get_version.outputs.icloudpd_version}}-linux-amd64
       if: ${{ matrix.os == 'ubuntu-latest' }}
 
     - name: Build Release Executables (MacOS)
       run: |
-        pyinstaller --onefile icloudpd.py --name icloudpd-${{needs.get_version.outputs.icloudpd_version}}-macos-amd64
-        pyinstaller --onefile icloud.py --name icloud-${{needs.get_version.outputs.icloudpd_version}}-macos-amd64
+        pyinstaller --collect-all keyrings.alt --hidden-import pkgutil --onefile icloudpd.py --name icloudpd-${{needs.get_version.outputs.icloudpd_version}}-macos-amd64
+        pyinstaller --collect-all keyrings.alt --hidden-import pkgutil --onefile icloud.py --name icloud-${{needs.get_version.outputs.icloudpd_version}}-macos-amd64
       if: ${{ matrix.os == 'macos-latest' }}
 
     - name: Upload artifacts

diff --git a/.github/workflows/quality-checks.yml b/.github/workflows/quality-checks.yml
@@ -89,20 +89,20 @@ jobs:
 
     - name: Build Release Executables (Windows)
       run: |
-        pyinstaller --onefile icloudpd.py --name icloudpd-${{needs.get_version.outputs.icloudpd_version}}-windows-amd64
-        pyinstaller --onefile icloud.py --name icloud-${{needs.get_version.outputs.icloudpd_version}}-windows-amd64
+        pyinstaller --collect-all keyrings.alt --hidden-import pkgutil --onefile icloudpd.py --name icloudpd-${{needs.get_version.outputs.icloudpd_version}}-windows-amd64
+        pyinstaller --collect-all keyrings.alt --hidden-import pkgutil --onefile icloud.py --name icloud-${{needs.get_version.outputs.icloudpd_version}}-windows-amd64
       if: ${{ matrix.os == 'windows-latest' }}
 
     - name: Build Release Executables (Linux)
       run: |
-        pyinstaller --onefile icloudpd.py --name icloudpd-${{needs.get_version.outputs.icloudpd_version}}-linux-amd64
-        pyinstaller --onefile icloud.py --name icloud-${{needs.get_version.outputs.icloudpd_version}}-linux-amd64
+        pyinstaller --collect-all keyrings.alt --hidden-import pkgutil --onefile icloudpd.py --name icloudpd-${{needs.get_version.outputs.icloudpd_version}}-linux-amd64
+        pyinstaller --collect-all keyrings.alt --hidden-import pkgutil --onefile icloud.py --name icloud-${{needs.get_version.outputs.icloudpd_version}}-linux-amd64
       if: ${{ matrix.os == 'ubuntu-latest' }}
 
     - name: Build Release Executables (MacOS)
       run: |
-        pyinstaller --onefile icloudpd.py --name icloudpd-${{needs.get_version.outputs.icloudpd_version}}-macos-amd64
-        pyinstaller --onefile icloud.py --name icloud-${{needs.get_version.outputs.icloudpd_version}}-macos-amd64
+        pyinstaller --collect-all keyrings.alt --hidden-import pkgutil --onefile icloudpd.py --name icloudpd-${{needs.get_version.outputs.icloudpd_version}}-macos-amd64
+        pyinstaller --collect-all keyrings.alt --hidden-import pkgutil --onefile icloud.py --name icloud-${{needs.get_version.outputs.icloudpd_version}}-macos-amd64
       if: ${{ matrix.os == 'macos-latest' }}
 
     - name: Upload artifacts

diff --git a/Dockerfile b/Dockerfile
@@ -12,8 +12,8 @@ COPY . .
 
 RUN pip3 install -r requirements-pip.txt -r requirements.txt -r requirements-dev.txt
 
-RUN pyinstaller -y icloudpd.py
-RUN pyinstaller -y icloud.py
+RUN pyinstaller -y --collect-all keyrings.alt --hidden-import pkgutil icloudpd.py 
+RUN pyinstaller -y --collect-all keyrings.alt --hidden-import pkgutil icloud.py
 RUN cp dist/icloud/icloud dist/icloudpd/
 
 FROM alpine:3.17 as runtime