forked from mirrors/protonmail-bridge-docker
Compare commits
139 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
044ea2b034 | ||
|
|
b643ecf9b6 | ||
|
|
e788a0098e | ||
|
|
4c7b9b9a8c | ||
|
|
6b4a3e23a8 | ||
|
|
e67c6cb97a | ||
|
|
84b7a76320 | ||
|
|
7e1b2d7104 | ||
|
|
89d488b2fb | ||
|
|
4ccd39856a | ||
|
|
540ba69528 | ||
|
|
546f813ea4 | ||
|
|
794e58400a | ||
|
|
2bd42d97ca | ||
|
|
c87479ac51 | ||
|
|
8ffef34853 | ||
|
|
2745c6eb57 | ||
|
|
d00645ffcc | ||
|
|
a19458f703 | ||
|
|
d2828adae6 | ||
|
|
3d628a35e3 | ||
|
|
718ccfacc2 | ||
|
|
6d4c8eee6c | ||
|
|
1cd0a1e01a | ||
|
|
a92c7d34d6 | ||
|
|
c7cef79482 | ||
|
|
7090760703 | ||
|
|
11cf98c1f4 | ||
|
|
69fd67721a | ||
|
|
abf6dd9055 | ||
|
|
363cef56c2 | ||
|
|
63e7e3098e | ||
|
|
64b50d7e24 | ||
|
|
f3da872c45 | ||
|
|
48717095db | ||
|
|
8d820748ee | ||
|
|
471a00b96b | ||
|
|
9b21cf69f1 | ||
|
|
3aee9f2e4a | ||
|
|
3be7e930d9 | ||
|
|
47e204b047 | ||
|
|
5b52d7c9aa | ||
|
|
bc9f21fa87 | ||
|
|
9d2bf07c78 | ||
|
|
2ac707c0c3 | ||
|
|
64495cd318 | ||
|
|
1a8b879f90 | ||
|
|
ca1fd017f0 | ||
|
|
a1afacb63a | ||
|
|
47e04a9690 | ||
|
|
5d94313662 | ||
|
|
5fd66d65ef | ||
|
|
43f5b98e9d | ||
|
|
0d0808a6cd | ||
|
|
ad930ab89f | ||
|
|
1fe6a19bd5 | ||
|
|
fc7540d86f | ||
|
|
9fb8bc7aae | ||
|
|
e782f3fca6 | ||
|
|
28068b7451 | ||
|
|
a262d3381a | ||
|
|
33196176b6 | ||
|
|
7358ead1c0 | ||
|
|
b764f02f7a | ||
|
|
3b069e5899 | ||
|
|
1423a659e1 | ||
|
|
932bc92e2a | ||
|
|
0ed338435d | ||
|
|
1b9e896e30 | ||
|
|
d9fec14796 | ||
|
|
b6a470849e | ||
|
|
ddb3df2c7c | ||
|
|
58cd2eee1d | ||
|
|
3cbc54a93b | ||
|
|
868b1a48c6 | ||
|
|
0419d36658 | ||
|
|
67415bd261 | ||
|
|
d0e4bcd866 | ||
|
|
5a0238e8f4 | ||
|
|
1dff35b541 | ||
|
|
7790563b9f | ||
|
|
7c0d8737dc | ||
|
|
50ac4c2e44 | ||
|
|
b1b6706030 | ||
|
|
b0eeddd83d | ||
|
|
a264602469 | ||
|
|
6a492a15e7 | ||
|
|
bb34034cbb | ||
|
|
109da843e7 | ||
|
|
b5938721aa | ||
|
|
dc8590849b | ||
|
|
8c80cf2d03 | ||
|
|
e6319a0dda | ||
|
|
da1b515c2f | ||
|
|
18626db87f | ||
|
|
89b3ef69f4 | ||
|
|
04a2fae963 | ||
|
|
bd9addf4f4 | ||
|
|
c3140a3fa0 | ||
|
|
51015361c5 | ||
|
|
0e92386a93 | ||
|
|
2e3bcdef1f | ||
|
|
cf1e025209 | ||
|
|
4dbf2f806e | ||
|
|
712de23988 | ||
|
|
0541f29d98 | ||
|
|
252397a86d | ||
|
|
6a2a413d0a | ||
|
|
60c8a9ecc4 | ||
|
|
535c80379d | ||
|
|
acefed1b95 | ||
|
|
6decf657c2 | ||
|
|
0fa5f9fc13 | ||
|
|
e0b0ce653c | ||
|
|
fa4ddf7126 | ||
|
|
07d3779fc6 | ||
|
|
2e9d95d90b | ||
|
|
a8f5c0a096 | ||
|
|
14cac1052d | ||
|
|
92b0c5bd5f | ||
|
|
812646acb9 | ||
|
|
664b5e924d | ||
|
|
680e82076e | ||
|
|
86e10823e0 | ||
|
|
22b04d941d | ||
|
|
4e11382bdb | ||
|
|
ba5d5297dc | ||
|
|
758406337f | ||
|
|
db7f0eb889 | ||
|
|
d73f3f4a63 | ||
|
|
683dd16a80 | ||
|
|
75bee435f5 | ||
|
|
e7020854f2 | ||
|
|
1ebd048bf8 | ||
|
|
a76b7f2725 | ||
|
|
616e4562a9 | ||
|
|
0372093a19 | ||
|
|
a147e41001 | ||
|
|
c45548e768 |
264
.github/workflows/build.yaml
vendored
264
.github/workflows/build.yaml
vendored
@@ -2,91 +2,231 @@ name: build from source
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
- dev
|
|
||||||
paths:
|
paths:
|
||||||
- .github/workflows/build.yaml
|
- .github/workflows/build.yaml
|
||||||
- build/*
|
- build/*
|
||||||
|
- VERSION
|
||||||
pull_request:
|
pull_request:
|
||||||
paths:
|
paths:
|
||||||
- .github/workflows/build.yaml
|
- .github/workflows/build.yaml
|
||||||
- build/*
|
- build/*
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
DOCKER_REPO: shenxn/protonmail-bridge
|
GHCR_REPO: shenxn/protonmail-bridge-docker
|
||||||
DOCKER_REPO_DEV: ghcr.io/shenxn/protonmail-bridge-dev
|
DOCKERHUB_REPO: shenxn/protonmail-bridge
|
||||||
PLATFORMS: linux/amd64,linux/arm64/v8
|
DOCKER_REPO_DEV: ghcr.io/shenxn/protonmail-bridge
|
||||||
|
PLATFORMS: linux/amd64,linux/arm64/v8,linux/arm/v7,linux/riscv64
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
services:
|
if: github.ref != 'refs/heads/master'
|
||||||
registry:
|
|
||||||
image: registry:2
|
|
||||||
ports:
|
|
||||||
- 5000:5000
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@master
|
uses: actions/checkout@master
|
||||||
|
|
||||||
- name: Set version
|
- name: Set version
|
||||||
id: version
|
id: version
|
||||||
run: echo "::set-output name=version::`cat build/VERSION`"
|
run: echo "version=`cat VERSION`" >> $GITHUB_ENV
|
||||||
- name: Set repo
|
|
||||||
id: repo
|
|
||||||
run: if [[ $GITHUB_REF == "refs/heads/master" ]]; then echo "::set-output name=repo::${DOCKER_REPO}"; else echo "::set-output name=repo::${DOCKER_REPO_DEV}"; fi
|
|
||||||
- name: Docker meta
|
- name: Docker meta
|
||||||
id: docker_meta
|
id: meta
|
||||||
uses: crazy-max/ghaction-docker-meta@v1
|
uses: docker/metadata-action@v5
|
||||||
with:
|
with:
|
||||||
images: ${{ steps.repo.outputs.repo }}
|
images: |
|
||||||
- name: Set up QEMU
|
${{ env.DOCKER_REPO_DEV }}
|
||||||
uses: docker/setup-qemu-action@v1
|
|
||||||
- name: Set up Docker Buildx
|
- name: Login to GHCR
|
||||||
uses: docker/setup-buildx-action@v1
|
uses: docker/login-action@v3
|
||||||
with:
|
|
||||||
driver-opts: network=host
|
|
||||||
- name: Build image without push to registry
|
|
||||||
uses: docker/build-push-action@v2
|
|
||||||
with:
|
|
||||||
context: ./build
|
|
||||||
file: ./build/Dockerfile
|
|
||||||
platforms: ${{ env.PLATFORMS }}
|
|
||||||
push: true
|
|
||||||
tags: localhost:5000/protonmail-bridge:latest
|
|
||||||
- name: Scan image
|
|
||||||
id: scan
|
|
||||||
uses: anchore/scan-action@v2
|
|
||||||
with:
|
|
||||||
image: localhost:5000/protonmail-bridge:latest
|
|
||||||
fail-build: true
|
|
||||||
severity-cutoff: critical
|
|
||||||
acs-report-enable: true
|
|
||||||
- name: Upload Anchore scan SARIF report
|
|
||||||
uses: github/codeql-action/upload-sarif@v1
|
|
||||||
with:
|
|
||||||
sarif_file: ${{ steps.scan.outputs.sarif }}
|
|
||||||
- name: Login to DockerHub
|
|
||||||
uses: docker/login-action@v1
|
|
||||||
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:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
password: ${{ secrets.CR_PAT }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
- name: Push image
|
|
||||||
uses: docker/build-push-action@v2
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
with:
|
with:
|
||||||
|
driver-opts: network=host
|
||||||
|
|
||||||
|
- name: Build and push by digest
|
||||||
|
id: build
|
||||||
|
uses: docker/build-push-action@v6
|
||||||
|
with:
|
||||||
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
outputs: type=image,"name=${{ env.DOCKER_REPO_DEV }}",push-by-digest=false,name-canonical=true,push=true
|
||||||
|
context: ./build
|
||||||
|
file: ./build/Dockerfile
|
||||||
|
tags: "${{ env.DOCKER_REPO_DEV }}:dev-${{ github.ref_name }}"
|
||||||
|
build-args: |
|
||||||
|
version=${{ env.version }}
|
||||||
|
|
||||||
|
- name: Run Trivy vulnerability scan
|
||||||
|
uses: aquasecurity/trivy-action@0.30.0
|
||||||
|
with:
|
||||||
|
image-ref: "${{ env.DOCKER_REPO_DEV }}:dev-${{ github.ref_name }}"
|
||||||
|
format: 'sarif'
|
||||||
|
exit-code: 0
|
||||||
|
severity: 'CRITICAL,HIGH'
|
||||||
|
output: 'trivy-results.sarif'
|
||||||
|
|
||||||
|
- name: Upload Trivy scan SARIF report
|
||||||
|
uses: github/codeql-action/upload-sarif@v3
|
||||||
|
with:
|
||||||
|
sarif_file: 'trivy-results.sarif'
|
||||||
|
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
platform:
|
||||||
|
- linux/amd64
|
||||||
|
- linux/arm64/v8
|
||||||
|
- linux/arm/v7
|
||||||
|
- linux/riscv64
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@master
|
||||||
|
|
||||||
|
- name: Prepare
|
||||||
|
run: |
|
||||||
|
platform=${{ matrix.platform }}
|
||||||
|
echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Set version
|
||||||
|
id: version
|
||||||
|
run: echo "version=`cat VERSION`" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Docker meta
|
||||||
|
id: meta
|
||||||
|
uses: docker/metadata-action@v5
|
||||||
|
with:
|
||||||
|
images: |
|
||||||
|
${{ env.DOCKERHUB_REPO }}
|
||||||
|
${{ env.GHCR_REPO }}
|
||||||
|
|
||||||
|
- name: Login to Docker Hub
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.REGISTRY_USERNAME }}
|
||||||
|
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||||
|
|
||||||
|
- name: Login to GHCR
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: ghcr.io
|
||||||
|
username: ${{ github.repository_owner }}
|
||||||
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Set up QEMU
|
||||||
|
uses: docker/setup-qemu-action@v3
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
|
- name: Build and push by digest
|
||||||
|
id: build
|
||||||
|
uses: docker/build-push-action@v6
|
||||||
|
with:
|
||||||
|
platforms: ${{ matrix.platform }}
|
||||||
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
outputs: type=image,"name=name=${{ env.DOCKERHUB_REPO }},${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=false
|
||||||
context: ./build
|
context: ./build
|
||||||
file: ./build/Dockerfile
|
file: ./build/Dockerfile
|
||||||
platforms: ${{ env.PLATFORMS }}
|
|
||||||
tags: |
|
tags: |
|
||||||
${{ steps.repo.outputs.repo }}:build
|
"${{ env.DOCKERHUB_REPO }}:build"
|
||||||
${{ steps.repo.outputs.repo }}:${{ steps.version.outputs.version }}-build
|
"${{ env.DOCKERHUB_REPO }}:${{ env.version }}-build"
|
||||||
labels: ${{ steps.docker_meta.outputs.labels }}
|
"${{ env.GHCR_REPO }}:build"
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
"${{ env.GHCR_REPO }}:${{ env.version }}-build"
|
||||||
|
provenance: false
|
||||||
|
sbom: false
|
||||||
|
build-args: |
|
||||||
|
version=${{ env.version }}
|
||||||
|
|
||||||
|
- name: Export digest
|
||||||
|
run: |
|
||||||
|
mkdir -p ${{ runner.temp }}/digests
|
||||||
|
digest="${{ steps.build.outputs.digest }}"
|
||||||
|
touch "${{ runner.temp }}/digests/${digest#sha256:}"
|
||||||
|
|
||||||
|
- name: Upload digest
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: digests-${{ env.PLATFORM_PAIR }}
|
||||||
|
path: ${{ runner.temp }}/digests/*
|
||||||
|
if-no-files-found: error
|
||||||
|
retention-days: 1
|
||||||
|
|
||||||
|
|
||||||
|
merge:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs:
|
||||||
|
- build
|
||||||
|
steps:
|
||||||
|
- name: Download digests
|
||||||
|
uses: actions/download-artifact@v4
|
||||||
|
with:
|
||||||
|
path: ${{ runner.temp }}/digests
|
||||||
|
pattern: digests-*
|
||||||
|
merge-multiple: true
|
||||||
|
|
||||||
|
- name: Set version
|
||||||
|
id: version
|
||||||
|
run: echo "version=`cat VERSION`" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- name: Login to Docker Hub
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.REGISTRY_USERNAME }}
|
||||||
|
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||||
|
|
||||||
|
- name: Login to GHCR
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: ghcr.io
|
||||||
|
username: ${{ github.repository_owner }}
|
||||||
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
with:
|
||||||
|
driver-opts: network=host
|
||||||
|
|
||||||
|
- name: Docker meta
|
||||||
|
id: meta
|
||||||
|
uses: docker/metadata-action@v5
|
||||||
|
with:
|
||||||
|
images: |
|
||||||
|
${{ env.DOCKERHUB_REPO }}
|
||||||
|
${{ env.GHCR_REPO }}
|
||||||
|
tags: |
|
||||||
|
type=raw,enable=true,value=${{ env.version }}-build
|
||||||
|
type=raw,enable=true,suffix=,value=build
|
||||||
|
|
||||||
|
- name: Create manifest list and push
|
||||||
|
working-directory: ${{ runner.temp }}/digests
|
||||||
|
run: |
|
||||||
|
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
|
||||||
|
$(printf '${{ env.DOCKERHUB_REPO }}@sha256:%s ' *)
|
||||||
|
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
|
||||||
|
$(printf '${{ env.GHCR_REPO }}@sha256:%s ' *)
|
||||||
|
|
||||||
|
- name: Run Trivy vulnerability scan
|
||||||
|
uses: aquasecurity/trivy-action@0.30.0
|
||||||
|
with:
|
||||||
|
image-ref: "${{ env.DOCKERHUB_REPO }}:${{ env.version }}-build"
|
||||||
|
format: 'sarif'
|
||||||
|
exit-code: 0
|
||||||
|
severity: 'CRITICAL,HIGH'
|
||||||
|
output: 'trivy-results.sarif'
|
||||||
|
- name: Upload Trivy scan SARIF report
|
||||||
|
uses: github/codeql-action/upload-sarif@v3
|
||||||
|
with:
|
||||||
|
sarif_file: 'trivy-results.sarif'
|
||||||
|
|
||||||
|
- name: Inspect image
|
||||||
|
run: |
|
||||||
|
docker buildx imagetools inspect ${{ env.DOCKERHUB_REPO }}:${{ steps.meta.outputs.version }}
|
||||||
|
docker buildx imagetools inspect ${{ env.GHCR_REPO }}:${{ steps.meta.outputs.version }}
|
||||||
|
|||||||
15
.github/workflows/deb.yaml
vendored
15
.github/workflows/deb.yaml
vendored
@@ -2,16 +2,15 @@ name: pack from deb
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
- dev
|
|
||||||
paths:
|
paths:
|
||||||
- .github/workflows/deb.yaml
|
- .github/workflows/deb.yaml
|
||||||
- deb/*
|
- deb/*
|
||||||
|
- VERSION
|
||||||
pull_request:
|
pull_request:
|
||||||
paths:
|
paths:
|
||||||
- .github/workflows/deb.yaml
|
- .github/workflows/deb.yaml
|
||||||
- deb/*
|
- deb/*
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
DOCKER_REPO: shenxn/protonmail-bridge
|
DOCKER_REPO: shenxn/protonmail-bridge
|
||||||
@@ -25,7 +24,7 @@ jobs:
|
|||||||
uses: actions/checkout@master
|
uses: actions/checkout@master
|
||||||
- name: Set version
|
- name: Set version
|
||||||
id: version
|
id: version
|
||||||
run: echo "::set-output name=version::`cat deb/VERSION`"
|
run: echo "version=`cat VERSION`" >> $GITHUB_ENV
|
||||||
- name: Set repo
|
- name: Set repo
|
||||||
id: repo
|
id: repo
|
||||||
run: if [[ $GITHUB_REF == "refs/heads/master" ]]; then echo "::set-output name=repo::${DOCKER_REPO}"; else echo "::set-output name=repo::${DOCKER_REPO_DEV}"; fi
|
run: if [[ $GITHUB_REF == "refs/heads/master" ]]; then echo "::set-output name=repo::${DOCKER_REPO}"; else echo "::set-output name=repo::${DOCKER_REPO_DEV}"; fi
|
||||||
@@ -52,18 +51,18 @@ jobs:
|
|||||||
severity-cutoff: critical
|
severity-cutoff: critical
|
||||||
acs-report-enable: true
|
acs-report-enable: true
|
||||||
- name: Upload Anchore scan SARIF report
|
- name: Upload Anchore scan SARIF report
|
||||||
uses: github/codeql-action/upload-sarif@v1
|
uses: github/codeql-action/upload-sarif@v3
|
||||||
with:
|
with:
|
||||||
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' && github.ref == 'refs/heads/master' }}
|
if: ${{ github.event_name != 'pull_request' }}
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.REGISTRY_USERNAME }}
|
username: ${{ secrets.REGISTRY_USERNAME }}
|
||||||
password: ${{ secrets.REGISTRY_PASSWORD }}
|
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||||
- name: Login to GitHub Container Registry
|
- name: Login to GitHub Container Registry
|
||||||
uses: docker/login-action@v1
|
uses: docker/login-action@v1
|
||||||
if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/dev' }}
|
if: ${{ github.event_name != 'pull_request' }}
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
@@ -75,6 +74,6 @@ jobs:
|
|||||||
file: ./deb/Dockerfile
|
file: ./deb/Dockerfile
|
||||||
tags: |
|
tags: |
|
||||||
${{ steps.repo.outputs.repo }}:latest
|
${{ steps.repo.outputs.repo }}:latest
|
||||||
${{ steps.repo.outputs.repo }}:${{ steps.version.outputs.version }}
|
${{ steps.repo.outputs.repo }}:${{ env.version }}
|
||||||
labels: ${{ steps.docker_meta.outputs.labels }}
|
labels: ${{ steps.docker_meta.outputs.labels }}
|
||||||
push: ${{ github.event_name != 'pull_request' }}
|
push: ${{ github.event_name != 'pull_request' }}
|
||||||
|
|||||||
3
.github/workflows/update-check.yaml
vendored
3
.github/workflows/update-check.yaml
vendored
@@ -2,9 +2,6 @@ name: update check
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
- dev
|
|
||||||
paths:
|
paths:
|
||||||
- .github/workflows/update-check.yaml
|
- .github/workflows/update-check.yaml
|
||||||
- update-check.py
|
- update-check.py
|
||||||
|
|||||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -0,0 +1,3 @@
|
|||||||
|
# Ignoring IDE-specific files
|
||||||
|
.idea/*
|
||||||
|
.vscode
|
||||||
|
|||||||
20
README.md
20
README.md
@@ -12,10 +12,6 @@ Docker Hub: [https://hub.docker.com/r/shenxn/protonmail-bridge](https://hub.dock
|
|||||||
|
|
||||||
GitHub: [https://github.com/shenxn/protonmail-bridge-docker](https://github.com/shenxn/protonmail-bridge-docker)
|
GitHub: [https://github.com/shenxn/protonmail-bridge-docker](https://github.com/shenxn/protonmail-bridge-docker)
|
||||||
|
|
||||||
## ARMv7 Builds
|
|
||||||
|
|
||||||
Currently there is a problem building the new parser targeting 32-bit architectures (i.e. `arm/v7`). The latest working build is `1.4.5-build`. Therefore, if you are using an `arm/v7` device like Raspberry Pi, do not upgrade to newer version. More information about the problem can be found [here](https://www.reddit.com/r/ProtonMail/comments/jvzm12/issue_building_bridge_150/). If you have any idea on how to fix this, a PR is welcome.
|
|
||||||
|
|
||||||
## ARM Support
|
## ARM Support
|
||||||
|
|
||||||
We now support ARM devices (`arm64` and `arm/v7`)! Use the images tagged with `build`. See next section for details.
|
We now support ARM devices (`arm64` and `arm/v7`)! Use the images tagged with `build`. See next section for details.
|
||||||
@@ -24,7 +20,7 @@ We now support ARM devices (`arm64` and `arm/v7`)! Use the images tagged with `b
|
|||||||
|
|
||||||
There are two types of images.
|
There are two types of images.
|
||||||
- `deb`: Images based on the official [.deb release](https://protonmail.com/bridge/install). It only supports the `amd64` architecture.
|
- `deb`: Images based on the official [.deb release](https://protonmail.com/bridge/install). It only supports the `amd64` architecture.
|
||||||
- `build`: Images based on the [source code](https://github.com/ProtonMail/proton-bridge). It supports `amd64`, `arm64`, and `arm/v7`. Supporting to more architectures is possible. PRs are welcome.
|
- `build`: Images based on the [source code](https://github.com/ProtonMail/proton-bridge). It supports `amd64`, `arm64`, `arm/v7` and `riscv64`. Supporting to more architectures is possible. PRs are welcome.
|
||||||
|
|
||||||
tag | description
|
tag | description
|
||||||
-- | --
|
-- | --
|
||||||
@@ -41,7 +37,13 @@ To initialize and add account to the bridge, run the following command.
|
|||||||
docker run --rm -it -v protonmail:/root shenxn/protonmail-bridge init
|
docker run --rm -it -v protonmail:/root shenxn/protonmail-bridge init
|
||||||
```
|
```
|
||||||
|
|
||||||
Wait for the bridge to startup, use `login` command and follow the instructions to add your account into the bridge. Then use `info` to see the configuration information (username and password). After that, use `exit` to exit the bridge. You may need `CTRL+C` to exit the docker entirely.
|
If you want to use Docker Compose instead, you can create a copy of the provided example [docker-compose.yml](docker-compose.yml) file, modify it to suit your needs, and then run the following command:
|
||||||
|
|
||||||
|
```
|
||||||
|
docker compose run protonmail-bridge init
|
||||||
|
```
|
||||||
|
|
||||||
|
Wait for the bridge to startup, then you will see a prompt appear for [Proton Mail Bridge interactive shell](https://proton.me/support/bridge-cli-guide). Use the `login` command and follow the instructions to add your account into the bridge. Then use `info` to see the configuration information (username and password). After that, use `exit` to exit the bridge. You may need `CTRL+C` to exit the docker entirely.
|
||||||
|
|
||||||
## Run
|
## Run
|
||||||
|
|
||||||
@@ -51,6 +53,12 @@ To run the container, use the following command.
|
|||||||
docker run -d --name=protonmail-bridge -v protonmail:/root -p 1025:25/tcp -p 1143:143/tcp --restart=unless-stopped shenxn/protonmail-bridge
|
docker run -d --name=protonmail-bridge -v protonmail:/root -p 1025:25/tcp -p 1143:143/tcp --restart=unless-stopped shenxn/protonmail-bridge
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Or, if using Docker Compose, use the following command.
|
||||||
|
|
||||||
|
```
|
||||||
|
docker compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
## Kubernetes
|
## Kubernetes
|
||||||
|
|
||||||
If you want to run this image in a Kubernetes environment. You can use the [Helm](https://helm.sh/) chart (https://github.com/k8s-at-home/charts/tree/master/charts/stable/protonmail-bridge) created by [@Eagleman7](https://github.com/Eagleman7). More details can be found in [#23](https://github.com/shenxn/protonmail-bridge-docker/issues/23).
|
If you want to run this image in a Kubernetes environment. You can use the [Helm](https://helm.sh/) chart (https://github.com/k8s-at-home/charts/tree/master/charts/stable/protonmail-bridge) created by [@Eagleman7](https://github.com/Eagleman7). More details can be found in [#23](https://github.com/shenxn/protonmail-bridge-docker/issues/23).
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
*
|
|
||||||
|
|
||||||
!.dockerignore
|
|
||||||
!VERSION
|
|
||||||
!entrypoint.sh
|
|
||||||
!gpgparams
|
|
||||||
!Dockerfile
|
|
||||||
!build.sh
|
|
||||||
@@ -1,15 +1,18 @@
|
|||||||
FROM golang:1.15 AS build
|
# The build image could be golang, but it currently does not support riscv64. Only debian:sid does, at the time of writing.
|
||||||
|
FROM debian:sid-slim AS build
|
||||||
|
|
||||||
|
ARG version
|
||||||
|
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
RUN apt-get update && apt-get install -y libsecret-1-dev
|
RUN apt-get update && apt-get install -y golang build-essential libsecret-1-dev
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
|
ADD https://github.com/ProtonMail/proton-bridge.git#${version} /build/
|
||||||
WORKDIR /build/
|
WORKDIR /build/
|
||||||
COPY build.sh VERSION /build/
|
RUN make build-nogui vault-editor
|
||||||
RUN bash build.sh
|
|
||||||
|
|
||||||
FROM ubuntu:bionic
|
FROM debian:sid-slim
|
||||||
LABEL maintainer="Xiaonan Shen <s@sxn.dev>"
|
LABEL maintainer="Simon Felding <sife@adm.ku.dk>"
|
||||||
|
|
||||||
EXPOSE 25/tcp
|
EXPOSE 25/tcp
|
||||||
EXPOSE 143/tcp
|
EXPOSE 143/tcp
|
||||||
@@ -23,6 +26,8 @@ RUN apt-get update \
|
|||||||
COPY gpgparams entrypoint.sh /protonmail/
|
COPY gpgparams entrypoint.sh /protonmail/
|
||||||
|
|
||||||
# Copy protonmail
|
# Copy protonmail
|
||||||
COPY --from=build /build/proton-bridge/proton-bridge /protonmail/
|
COPY --from=build /build/bridge /protonmail/
|
||||||
|
COPY --from=build /build/proton-bridge /protonmail/
|
||||||
|
COPY --from=build /build/vault-editor /protonmail/
|
||||||
|
|
||||||
ENTRYPOINT ["bash", "/protonmail/entrypoint.sh"]
|
ENTRYPOINT ["bash", "/protonmail/entrypoint.sh"]
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
1.8.9
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -ex
|
|
||||||
|
|
||||||
VERSION=`cat VERSION`
|
|
||||||
|
|
||||||
# Clone new code
|
|
||||||
git clone https://github.com/ProtonMail/proton-bridge.git
|
|
||||||
cd proton-bridge
|
|
||||||
git checkout v$VERSION
|
|
||||||
|
|
||||||
# Build
|
|
||||||
make build-nogui
|
|
||||||
@@ -8,6 +8,12 @@ if [[ $1 == init ]]; then
|
|||||||
# Initialize pass
|
# Initialize pass
|
||||||
gpg --generate-key --batch /protonmail/gpgparams
|
gpg --generate-key --batch /protonmail/gpgparams
|
||||||
pass init pass-key
|
pass init pass-key
|
||||||
|
|
||||||
|
# Kill the other instance as only one can be running at a time.
|
||||||
|
# This allows users to run entrypoint init inside a running conainter
|
||||||
|
# which is useful in a k8s environment.
|
||||||
|
# || true to make sure this would not fail in case there is no running instance.
|
||||||
|
pkill protonmail-bridge || true
|
||||||
|
|
||||||
# Login
|
# Login
|
||||||
/protonmail/proton-bridge --cli $@
|
/protonmail/proton-bridge --cli $@
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
*
|
|
||||||
|
|
||||||
!.dockerignore
|
|
||||||
!VERSION
|
|
||||||
!entrypoint.sh
|
|
||||||
!install.sh
|
|
||||||
!gpgparams
|
|
||||||
!Dockerfile
|
|
||||||
@@ -1,5 +1,16 @@
|
|||||||
FROM ubuntu:bionic
|
### The Deb install is just a repack of the official ProtonMail Bridge deb package with less dependencies.
|
||||||
LABEL maintainer="Xiaonan Shen <s@sxn.dev>"
|
### I recommend you don't use this. It's here for legacy reasons.
|
||||||
|
|
||||||
|
FROM debian:sid-slim AS build
|
||||||
|
|
||||||
|
COPY install.sh PACKAGE /
|
||||||
|
RUN apt-get update && apt-get install -y wget binutils
|
||||||
|
|
||||||
|
# Repack deb (removes unnecessary dependencies and produces /protonmail.deb)
|
||||||
|
RUN bash /install.sh
|
||||||
|
|
||||||
|
FROM debian:sid-slim
|
||||||
|
LABEL maintainer="Simon Felding <sife@adm.ku.dk>"
|
||||||
|
|
||||||
EXPOSE 25/tcp
|
EXPOSE 25/tcp
|
||||||
EXPOSE 143/tcp
|
EXPOSE 143/tcp
|
||||||
@@ -7,9 +18,11 @@ EXPOSE 143/tcp
|
|||||||
WORKDIR /protonmail
|
WORKDIR /protonmail
|
||||||
|
|
||||||
# Copy bash scripts
|
# Copy bash scripts
|
||||||
COPY gpgparams install.sh entrypoint.sh VERSION /protonmail/
|
COPY gpgparams entrypoint.sh PACKAGE /protonmail/
|
||||||
|
COPY --from=build /protonmail.deb /tmp/protonmail.deb
|
||||||
|
|
||||||
# Install dependencies and protonmail bridge
|
RUN apt-get update \
|
||||||
RUN bash install.sh
|
&& apt-get install -y --no-install-recommends /tmp/protonmail.deb socat pass libsecret-1-0 ca-certificates procps \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
ENTRYPOINT ["bash", "/protonmail/entrypoint.sh"]
|
CMD ["bash", "/protonmail/entrypoint.sh"]
|
||||||
|
|||||||
1
deb/PACKAGE
Normal file
1
deb/PACKAGE
Normal file
@@ -0,0 +1 @@
|
|||||||
|
https://github.com/ProtonMail/proton-bridge/releases/download/v3.21.2/protonmail-bridge_3.21.2-1_amd64.deb
|
||||||
@@ -1 +0,0 @@
|
|||||||
1.8.7-1
|
|
||||||
@@ -1,36 +1,16 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
|
|
||||||
VERSION=`cat VERSION`
|
|
||||||
DEB_FILE=protonmail-bridge_${VERSION}_amd64.deb
|
|
||||||
|
|
||||||
# Install dependents
|
|
||||||
apt-get update
|
|
||||||
apt-get install -y --no-install-recommends socat pass ca-certificates
|
|
||||||
|
|
||||||
# Build time dependencies
|
|
||||||
apt-get install -y wget binutils xz-utils
|
|
||||||
|
|
||||||
# Repack deb (remove unnecessary dependencies)
|
# Repack deb (remove unnecessary dependencies)
|
||||||
mkdir deb
|
mkdir deb
|
||||||
|
wget -i /PACKAGE -O /deb/protonmail.deb
|
||||||
cd deb
|
cd deb
|
||||||
wget -q https://protonmail.com/download/bridge/${DEB_FILE}
|
ar x -v protonmail.deb
|
||||||
ar x -v ${DEB_FILE}
|
|
||||||
mkdir control
|
mkdir control
|
||||||
tar zxvf control.tar.gz -C control
|
tar zxvf control.tar.gz -C control
|
||||||
sed -i "s/^Depends: .*$/Depends: libgl1, libc6, libsecret-1-0, libstdc++6, libgcc1/" control/control
|
sed -i "s/^Depends: .*$/Depends: libgl1, libc6, libsecret-1-0, libstdc++6, libgcc1/" control/control
|
||||||
cd control
|
cd control
|
||||||
tar zcvf ../control.tar.gz .
|
tar zcvf ../control.tar.gz .
|
||||||
cd ../
|
cd ../
|
||||||
ar rcs -v ${DEB_FILE} debian-binary control.tar.gz data.tar.gz
|
|
||||||
cd ../
|
|
||||||
|
|
||||||
# Install protonmail bridge
|
ar rcs -v /protonmail.deb debian-binary control.tar.gz data.tar.gz
|
||||||
apt-get install -y --no-install-recommends ./deb/${DEB_FILE}
|
|
||||||
|
|
||||||
# Cleanup
|
|
||||||
apt-get purge -y wget binutils xz-utils
|
|
||||||
apt-get autoremove -y
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
||||||
rm -rf deb
|
|
||||||
|
|||||||
14
docker-compose.yml
Normal file
14
docker-compose.yml
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
version: '2.1'
|
||||||
|
|
||||||
|
services:
|
||||||
|
protonmail-bridge:
|
||||||
|
image: shenxn/protonmail-bridge
|
||||||
|
ports:
|
||||||
|
- 1025:25/tcp
|
||||||
|
- 1143:143/tcp
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- protonmail:/root
|
||||||
|
volumes:
|
||||||
|
protonmail:
|
||||||
|
name: protonmail
|
||||||
@@ -1,64 +1,37 @@
|
|||||||
import sys
|
import requests, os, sys
|
||||||
import os
|
|
||||||
import requests
|
|
||||||
import json
|
|
||||||
import re
|
|
||||||
|
|
||||||
|
def git(command):
|
||||||
|
return os.system(f"git {command}")
|
||||||
|
|
||||||
|
|
||||||
|
release = requests.get("https://api.github.com/repos/protonmail/proton-bridge/releases/latest").json()
|
||||||
|
version = release['tag_name']
|
||||||
|
deb = [asset for asset in release ['assets'] if asset['name'].endswith('.deb')][0]['browser_download_url']
|
||||||
|
|
||||||
|
print(f"Latest release is: {version}")
|
||||||
|
|
||||||
|
with open("VERSION", 'w') as f:
|
||||||
|
f.write(version)
|
||||||
|
|
||||||
|
with open("deb/PACKAGE", 'w') as f:
|
||||||
|
f.write(deb)
|
||||||
|
|
||||||
|
git("config --local user.name 'GitHub Actions'")
|
||||||
|
git("config --local user.email 'actions@github.com'")
|
||||||
|
|
||||||
|
git("add -A")
|
||||||
|
|
||||||
|
if git("diff --cached --quiet") == 0: # Returns 0 if there are no changes
|
||||||
|
print("Version didn't change")
|
||||||
|
exit(0)
|
||||||
|
|
||||||
|
git(f"commit -m 'Bump version to {version}'")
|
||||||
is_pull_request = sys.argv[1] == "true"
|
is_pull_request = sys.argv[1] == "true"
|
||||||
print(f"is_pull_request={is_pull_request}")
|
|
||||||
|
|
||||||
|
if is_pull_request:
|
||||||
|
print("This is a pull request, skipping push step.")
|
||||||
|
exit(0)
|
||||||
|
|
||||||
def check_version(directory, new_version):
|
if git("push") != 0:
|
||||||
print(f"Checking version for {directory}")
|
print("Git push failed!")
|
||||||
|
exit(1)
|
||||||
if not new_version:
|
|
||||||
print("Failed to get new version. Exiting.")
|
|
||||||
exit(1)
|
|
||||||
|
|
||||||
with open(f"{directory}/VERSION", "r") as f:
|
|
||||||
old_version = f.read().rstrip()
|
|
||||||
|
|
||||||
print(f"Up-to-date version {new_version}")
|
|
||||||
print(f"Current version: {old_version}")
|
|
||||||
|
|
||||||
if old_version != new_version:
|
|
||||||
print(f"New release found: {new_version}")
|
|
||||||
|
|
||||||
# bump up to new release
|
|
||||||
with open(f"{directory}/VERSION", "w") as f:
|
|
||||||
f.write(new_version)
|
|
||||||
# commit
|
|
||||||
result = os.system(f"git config --local user.email 'actions@github.com' \
|
|
||||||
&& git config --local user.name 'GitHub Actions' \
|
|
||||||
&& git add {directory}/VERSION \
|
|
||||||
&& git commit -m 'Bump {directory} version to {new_version}'")
|
|
||||||
if result != 0:
|
|
||||||
print("Failed to commit the bump. Exiting")
|
|
||||||
exit(1)
|
|
||||||
if is_pull_request:
|
|
||||||
print("Action triggered by pull request. Do not push.")
|
|
||||||
else:
|
|
||||||
result = os.system("git push")
|
|
||||||
if result != 0:
|
|
||||||
print("Failed to push. Exiting")
|
|
||||||
exit(1)
|
|
||||||
else:
|
|
||||||
print(f"Already newest version {old_version}")
|
|
||||||
|
|
||||||
|
|
||||||
# check deb version
|
|
||||||
response = requests.get("https://protonmail.com/download/current_version_linux.json")
|
|
||||||
content = json.loads(response.content)
|
|
||||||
version = re.match(".*_([0-9.-]+)_amd64\.deb", content["DebFile"]).group(1)
|
|
||||||
check_version("deb", version)
|
|
||||||
|
|
||||||
|
|
||||||
# check build version
|
|
||||||
response = requests.get(
|
|
||||||
"https://api.github.com/repos/ProtonMail/proton-bridge/tags",
|
|
||||||
headers={"Accept": "application/vnd.github.v3+json"},
|
|
||||||
)
|
|
||||||
tags = json.loads(response.content)
|
|
||||||
version_re = re.compile("v\d+\.\d+\.\d+")
|
|
||||||
releases = [tag["name"][1:] for tag in tags if version_re.match(tag["name"])]
|
|
||||||
check_version("build", releases[0])
|
|
||||||
|
|||||||
Reference in New Issue
Block a user