diff --git a/build/Dockerfile b/build/Dockerfile index 78d4c15..ff73834 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -17,8 +17,7 @@ RUN sed -i 's/127.0.0.1/0.0.0.0/g' internal/constants/constants.go RUN set -eux; \ make build-nogui vault-editor -FROM ubuntu:latest -LABEL maintainer="Xiaonan Shen " +FROM alpine:latest EXPOSE 1025/tcp EXPOSE 1143/tcp @@ -26,11 +25,11 @@ EXPOSE 1143/tcp RUN mkdir -p /root/.gnupg && chmod 700 /root/.gnupg # Install dependencies and protonmail bridge -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - pass libsecret-1-0 ca-certificates libfido2-1 \ - dbus dbus-x11 gnupg2 \ - && rm -rf /var/lib/apt/lists/* +RUN apk add --no-cache \ + gcompat \ + libsecret \ + libfido2 \ + gnupg pass ca-certificates # Copy bash scripts COPY gpgparams entrypoint.sh /protonmail/ diff --git a/build/entrypoint.sh b/build/entrypoint.sh index 4914e3b..ec3f25b 100644 --- a/build/entrypoint.sh +++ b/build/entrypoint.sh @@ -19,7 +19,10 @@ if [[ $1 == init ]]; then proton-bridge --cli $@ else - eval "$(dbus-launch --sh-syntax --exit-with-session)" + # Change Permission when Folder Exists + if [ -d "/root/.gnupg" ]; then + chmod 700 /root/.gnupg + fi # Start protonmail # Fake a terminal, so it does not quit because of EOF...