Skip to content

Commit

Permalink
Merge from upstream (yo8192#4)
Browse files Browse the repository at this point in the history
* Bump build version to 3.0.10

* Bump build version to 3.0.12

* Bump build version to 3.0.14

* Bump build version to 3.0.15

* Bump build version to 3.0.16

* Bump deb version to 3.0.17-1

* Bump build version to 3.0.18

* Bump deb version to 3.0.19-1

* Bump build version to 3.0.19

* Bump deb version to 3.0.20-1

* Bump build version to 3.0.20

* Update Ubuntu tag for deb to fix GLIBC dependency (shenxn#80)

GLIBC dependency issue highlighted in
shenxn#79 is caused
by v3 of the bridge not supporting bionic. This PR simply updates the
"deb" version to match the "build" version which is already on
ubuntu:jammy.

* Bump deb version to 3.0.21-1

* Bump build version to 3.0.21

* Bump build version to 3.1.0

* Bump build version to 3.1.1

* Bump deb version to 3.1.2-1

* Bump build version to 3.1.2

* Add a docker compose file (shenxn#70)

It's quite the norm to include a docker-compose file, generally in the
README or the root for people to copy and modify. For example as
https://github.com/wfg/docker-openvpn-client has done so.

If there are [Environmental
variables](https://github.com/wfg/docker-openvpn-client#environment-variables),
they should also be documented - in this case there isn't.

* Bump deb version to 3.1.3-1

* Bump build version to 3.1.3

* Bump build version to 3.2.0

* Bump deb version to 3.2.0-1

* Bump build version to 3.3.0

* Bump deb version to 3.3.0-1

* Bump build version to 3.3.1

* Bump deb version to 3.3.2-1

* Bump build version to 3.3.2

* Bump build version to 3.4.0

* Bump build version to 3.4.1

* Bump build version to 3.4.2

* Bump build version to 3.5.0

* Bump deb version to 3.4.2-1

* Bump build version to 3.5.1

* Bump deb version to 3.5.1-1

* Bump deb version to 3.4.2-1

* Bump build version to 3.5.2

* Bump deb version to 3.5.3-1

* Bump build version to 3.5.3

* Bump build version to 3.6.0

* Bump deb version to 3.5.4-1

* Bump build version to 3.6.1

* Bump deb version to 3.6.1-2

* Bump build version to 3.7.0

* Bump build version to 3.7.1

* Bump deb version to 3.7.1-1

* Bump build version to 3.8.0

* Bump build version to 3.8.1

* Bump deb version to 3.8.1-1

* Bump build version to 3.9.0

* Bump deb version to 3.8.2-1

---------

Co-authored-by: GitHub Actions <[email protected]>
Co-authored-by: Aziz Hasanain <[email protected]>
Co-authored-by: Daniel Nathan Gray <[email protected]>
  • Loading branch information
4 people authored and mcarr823 committed Jul 21, 2024
1 parent f76e275 commit 257b2fd
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.7
3.9.0
2 changes: 1 addition & 1 deletion deb/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.12.0-1
3.8.2-1
8 changes: 6 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@ version: '2.1'
services:
protonmail-bridge:
image: shenxn/protonmail-bridge
# build:
# context: ./build
# dockerfile: Dockerfile
container_name: pm_bridge
ports:
- 1025:25/tcp
- 1143:143/tcp
restart: unless-stopped
volumes:
- protonmail:/root
stdin_open: true
tty: true
volumes:
protonmail:
name: protonmail

0 comments on commit 257b2fd

Please sign in to comment.