Mouws/protonmail-bridge-nextcoud-podman
1
0
Fork 1
mirror of https://github.com/shenxn/protonmail-bridge-docker.git synced 2025-12-06 08:27:08 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix deb build (#18)

Browse Source 
* Move dev images to ghcr

* Fix deb install
This commit is contained in:
Xiaonan Shen 2021-01-07 13:57:03 +08:00 committed by GitHub
parent 46f6f1cc40
commit bde4667ff4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/build.yaml vendored
View File

@ -15,7 +15,7 @@ on:
env: env:
DOCKER_REPO: shenxn/protonmail-bridge DOCKER_REPO: shenxn/protonmail-bridge
DOCKER_REPO_DEV: shenxn/protonmail-bridge-dev DOCKER_REPO_DEV: ghcr.io/shenxn/protonmail-bridge-dev
jobs: jobs:
build: build:
@ -67,10 +67,17 @@ jobs:
sarif_file: ${{ steps.scan.outputs.sarif }} sarif_file: ${{ steps.scan.outputs.sarif }}
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@v1 uses: docker/login-action@v1
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/master' }}
with: with:
username: ${{ secrets.REGISTRY_USERNAME }} username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }} 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 - name: Push image
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:

11
.github/workflows/deb.yaml vendored
View File

@ -15,7 +15,7 @@ on:
env: env:
DOCKER_REPO: shenxn/protonmail-bridge DOCKER_REPO: shenxn/protonmail-bridge
DOCKER_REPO_DEV: shenxn/protonmail-bridge-dev DOCKER_REPO_DEV: ghcr.io/shenxn/protonmail-bridge-dev
jobs: jobs:
deb: deb:
@ -57,10 +57,17 @@ jobs:
sarif_file: ${{ steps.scan.outputs.sarif }} sarif_file: ${{ steps.scan.outputs.sarif }}
- name: Login to DockerHub - name: Login to DockerHub
uses: docker/login-action@v1 uses: docker/login-action@v1
if: ${{ github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/master' }}
with: with:
username: ${{ secrets.REGISTRY_USERNAME }} username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }} 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 - name: Push image
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:

10
deb/install.sh
View File

@ -15,15 +15,15 @@ apt-get install -y wget binutils xz-utils
# Repack deb (remove unnecessary dependencies) # Repack deb (remove unnecessary dependencies)
mkdir deb mkdir deb
cd deb cd deb
wget https://protonmail.com/download/${DEB_FILE} wget -q https://protonmail.com/download/${DEB_FILE}
ar x -v ${DEB_FILE} ar x -v ${DEB_FILE}
mkdir control mkdir control
tar xvfJ control.tar.xz -C control tar zxvf control.tar.gz -C control
sed -i "s/^Depends: .*$/Depends: libsecret-1-0, libgl1-mesa-glx/" control/control sed -i "s/^Depends: .*$/Depends: libgl1, libc6, libsecret-1-0, libstdc++6, libgcc1/" control/control
cd control cd control
tar cvfJ ../control.tar.xz . tar zcvf ../control.tar.gz .
cd ../ 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 ../ cd ../
# Install protonmail bridge # Install protonmail bridge