From 69f65ed4092c26f96dbd4e02134c0031b1d19f7d Mon Sep 17 00:00:00 2001 From: Thibault Godouet Date: Sat, 3 Feb 2024 14:13:08 +0000 Subject: [PATCH] Merge from upstream (#4) * 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 (#80) GLIBC dependency issue highlighted in https://github.com/shenxn/protonmail-bridge-docker/issues/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 (#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 Co-authored-by: Aziz Hasanain Co-authored-by: Daniel Nathan Gray --- build/VERSION | 2 +- deb/Dockerfile | 2 +- deb/VERSION | 2 +- docker-compose.yml | 18 ++++++++++++++++++ 4 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 docker-compose.yml diff --git a/build/VERSION b/build/VERSION index 489200c5..b72ad011 100644 --- a/build/VERSION +++ b/build/VERSION @@ -1 +1 @@ -3.0.9 \ No newline at end of file +3.9.0 \ No newline at end of file diff --git a/deb/Dockerfile b/deb/Dockerfile index d225dafe..8aa8bc7b 100644 --- a/deb/Dockerfile +++ b/deb/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:bionic +FROM ubuntu:jammy LABEL maintainer="Xiaonan Shen " EXPOSE 25/tcp diff --git a/deb/VERSION b/deb/VERSION index a472920e..cb5cc1b1 100644 --- a/deb/VERSION +++ b/deb/VERSION @@ -1 +1 @@ -2.3.0-1 \ No newline at end of file +3.8.2-1 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..cdea9b55 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,18 @@ +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 + stdin_open: true + tty: true +volumes: + protonmail: + name: protonmail