Merge branch 'master' into support-rootless
This commit is contained in:
commit
3e0cc0ff8d
6 changed files with 15 additions and 14 deletions
|
|
@ -1,4 +1,4 @@
|
|||
FROM ubuntu:jammy
|
||||
FROM debian:sid-slim
|
||||
LABEL maintainer="Xiaonan Shen <s@sxn.dev>"
|
||||
|
||||
# These are only exported if running as root
|
||||
|
|
@ -13,6 +13,13 @@ WORKDIR /protonmail
|
|||
# Copy bash scripts
|
||||
COPY gpgparams install.sh entrypoint.sh VERSION /protonmail/
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends socat pass procps libsecret-1-0 ca-certificates \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Copy bash scripts
|
||||
COPY gpgparams entrypoint.sh /protonmail/
|
||||
|
||||
# Install dependencies and protonmail bridge
|
||||
RUN bash install.sh
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
3.15.0-1
|
||||
3.19.0-1
|
||||
Loading…
Add table
Add a link
Reference in a new issue