Merge branch 'master' into support-rootless

This commit is contained in:
simonfelding 2025-04-24 23:49:32 +02:00 committed by GitHub
commit ef7ba0ba6f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 262 additions and 211 deletions

View file

@ -1,5 +1,16 @@
### The Deb install is just a repack of the official ProtonMail Bridge deb package with less dependencies.
### 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="Xiaonan Shen <s@sxn.dev>"
LABEL maintainer="Simon Felding <sife@adm.ku.dk>"
# These are only exported if running as root
EXPOSE 25/tcp
@ -11,16 +22,11 @@ EXPOSE 2143/tcp
WORKDIR /protonmail
# 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
RUN apt-get update \
&& apt-get install -y --no-install-recommends socat pass procps libsecret-1-0 ca-certificates \
&& apt-get install -y --no-install-recommends /tmp/protonmail.deb socat pass libsecret-1-0 ca-certificates procps \
&& rm -rf /var/lib/apt/lists/*
# Copy bash scripts
COPY gpgparams entrypoint.sh /protonmail/
# Install dependencies and protonmail bridge
RUN bash install.sh
ENTRYPOINT ["bash", "/protonmail/entrypoint.sh"]
CMD ["bash", "/protonmail/entrypoint.sh"]