change /build to /build/proton-bridge/ and add pass into build image and copy vault-editor into base image
Build and Push Docker Container / build-and-push (push) Successful in 5m48s
Build and Push Docker Container / build-and-push (push) Successful in 5m48s
This commit is contained in:
+8
-5
@@ -7,11 +7,12 @@ RUN apt-get update && apt-get install -y \
|
|||||||
build-essential \
|
build-essential \
|
||||||
libsecret-1-dev \
|
libsecret-1-dev \
|
||||||
libfido2-dev \
|
libfido2-dev \
|
||||||
libcbor-dev
|
libcbor-dev \
|
||||||
|
pass
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
ADD https://github.com/ProtonMail/proton-bridge.git#${VERSION} /build/
|
ADD https://github.com/ProtonMail/proton-bridge.git#${VERSION} /build/proton-bridge/
|
||||||
WORKDIR /build/
|
WORKDIR /build/proton-bridge/
|
||||||
RUN sed -i 's/127.0.0.1/0.0.0.0/g' internal/constants/constants.go
|
RUN sed -i 's/127.0.0.1/0.0.0.0/g' internal/constants/constants.go
|
||||||
RUN set -eux; \
|
RUN set -eux; \
|
||||||
make build-nogui vault-editor
|
make build-nogui vault-editor
|
||||||
@@ -33,7 +34,9 @@ RUN apt-get update \
|
|||||||
COPY gpgparams entrypoint.sh /protonmail/
|
COPY gpgparams entrypoint.sh /protonmail/
|
||||||
|
|
||||||
# Copy protonmail
|
# Copy protonmail
|
||||||
COPY --from=build /build/bridge /protonmail/
|
WORKDIR /usr/bin/
|
||||||
COPY --from=build /build/proton-bridge /protonmail/
|
COPY --from=build /build/proton-bridge/bridge /usr/bin/
|
||||||
|
COPY --from=build /build/proton-bridge/proton-bridge /usr/bin/
|
||||||
|
COPY --from=build /build/proton-bridge/vault-editor /usr/bin/
|
||||||
|
|
||||||
ENTRYPOINT ["bash", "/protonmail/entrypoint.sh"]
|
ENTRYPOINT ["bash", "/protonmail/entrypoint.sh"]
|
||||||
|
|||||||
+2
-2
@@ -16,7 +16,7 @@ if [[ $1 == init ]]; then
|
|||||||
pkill protonmail-bridge || true
|
pkill protonmail-bridge || true
|
||||||
|
|
||||||
# Login
|
# Login
|
||||||
/protonmail/proton-bridge --cli $@
|
proton-bridge --cli $@
|
||||||
|
|
||||||
else
|
else
|
||||||
eval "$(dbus-launch --sh-syntax --exit-with-session)"
|
eval "$(dbus-launch --sh-syntax --exit-with-session)"
|
||||||
@@ -25,6 +25,6 @@ else
|
|||||||
# Fake a terminal, so it does not quit because of EOF...
|
# Fake a terminal, so it does not quit because of EOF...
|
||||||
rm -f faketty
|
rm -f faketty
|
||||||
mkfifo faketty
|
mkfifo faketty
|
||||||
cat faketty | /protonmail/proton-bridge --cli $@
|
cat faketty | proton-bridge --cli $@
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user