From bde4667ff4da045243c9b59297f51928c492fdba Mon Sep 17 00:00:00 2001
From: Xiaonan Shen <s@sxn.dev>
Date: Thu, 7 Jan 2021 13:57:03 +0800
Subject: [PATCH] Fix deb build (#18)

* Move dev images to ghcr

* Fix deb install
---
 .github/workflows/build.yaml | 11 +++++++++--
 .github/workflows/deb.yaml   | 11 +++++++++--
 deb/install.sh               | 10 +++++-----
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d2db625..7a24b06 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -15,7 +15,7 @@ on:
 
 env:
   DOCKER_REPO: shenxn/protonmail-bridge
-  DOCKER_REPO_DEV: shenxn/protonmail-bridge-dev
+  DOCKER_REPO_DEV: ghcr.io/shenxn/protonmail-bridge-dev
 
 jobs:
   build:
@@ -67,10 +67,17 @@ jobs:
           sarif_file: ${{ steps.scan.outputs.sarif }}
       - name: Login to DockerHub
         uses: docker/login-action@v1
-        if: ${{ github.event_name != 'pull_request' }}
+        if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/master' }}
         with:
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/dev' }}
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.CR_PAT }}
       - name: Push image
         uses: docker/build-push-action@v2
         with:
diff --git a/.github/workflows/deb.yaml b/.github/workflows/deb.yaml
index 639129d..a529c66 100644
--- a/.github/workflows/deb.yaml
+++ b/.github/workflows/deb.yaml
@@ -15,7 +15,7 @@ on:
 
 env:
   DOCKER_REPO: shenxn/protonmail-bridge
-  DOCKER_REPO_DEV: shenxn/protonmail-bridge-dev
+  DOCKER_REPO_DEV: ghcr.io/shenxn/protonmail-bridge-dev
 
 jobs:
   deb:
@@ -57,10 +57,17 @@ jobs:
           sarif_file: ${{ steps.scan.outputs.sarif }}
       - name: Login to DockerHub
         uses: docker/login-action@v1
-        if: ${{ github.event_name != 'pull_request' }}
+        if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/master' }}
         with:
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/dev' }}
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.CR_PAT }}
       - name: Push image
         uses: docker/build-push-action@v2
         with:
diff --git a/deb/install.sh b/deb/install.sh
index 4e09567..bb3b893 100644
--- a/deb/install.sh
+++ b/deb/install.sh
@@ -15,15 +15,15 @@ apt-get install -y wget binutils xz-utils
 # Repack deb (remove unnecessary dependencies)
 mkdir deb
 cd deb
-wget https://protonmail.com/download/${DEB_FILE}
+wget -q https://protonmail.com/download/${DEB_FILE}
 ar x -v ${DEB_FILE}
 mkdir control
-tar xvfJ control.tar.xz -C control
-sed -i "s/^Depends: .*$/Depends: libsecret-1-0, libgl1-mesa-glx/" control/control
+tar zxvf control.tar.gz -C control
+sed -i "s/^Depends: .*$/Depends: libgl1, libc6, libsecret-1-0, libstdc++6, libgcc1/" control/control
 cd control
-tar cvfJ ../control.tar.xz .
+tar zcvf ../control.tar.gz .
 cd ../
-ar rcs -v ${DEB_FILE} debian-binary control.tar.xz data.tar.xz
+ar rcs -v ${DEB_FILE} debian-binary control.tar.gz data.tar.gz
 cd ../
 
 # Install protonmail bridge