Merge pull request 'Add libfido2 dependency for Bridge v3.22.0' (#1) from fix/libfido2-3.22 into master
Some checks failed
build from source / test (push) Has been skipped
build from source / build (linux/arm/v7) (push) Has been cancelled
build from source / build (linux/arm64/v8) (push) Has been cancelled
build from source / build (linux/riscv64) (push) Has been cancelled
build from source / merge (push) Has been cancelled
build from source / build (linux/amd64) (push) Has been cancelled
Mirroring / Mirror to Gitee (push) Has been cancelled
pack from deb / deb (push) Has been cancelled
Some checks failed
build from source / test (push) Has been skipped
build from source / build (linux/arm/v7) (push) Has been cancelled
build from source / build (linux/arm64/v8) (push) Has been cancelled
build from source / build (linux/riscv64) (push) Has been cancelled
build from source / merge (push) Has been cancelled
build from source / build (linux/amd64) (push) Has been cancelled
Mirroring / Mirror to Gitee (push) Has been cancelled
pack from deb / deb (push) Has been cancelled
This commit was merged in pull request #1.
This commit is contained in:
@@ -4,7 +4,7 @@ FROM debian:sid-slim AS build
|
|||||||
ARG version
|
ARG version
|
||||||
|
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
RUN apt-get update && apt-get install -y golang build-essential libsecret-1-dev
|
RUN apt-get update && apt-get install -y golang build-essential libsecret-1-dev libfido2-dev libcbor-dev
|
||||||
|
|
||||||
# Build
|
# Build
|
||||||
ADD https://github.com/ProtonMail/proton-bridge.git#${version} /build/
|
ADD https://github.com/ProtonMail/proton-bridge.git#${version} /build/
|
||||||
@@ -19,7 +19,7 @@ EXPOSE 143/tcp
|
|||||||
|
|
||||||
# Install dependencies and protonmail bridge
|
# Install dependencies and protonmail bridge
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends socat pass libsecret-1-0 ca-certificates \
|
&& apt-get install -y --no-install-recommends socat pass libsecret-1-0 libfido2-1 ca-certificates \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# Copy bash scripts
|
# Copy bash scripts
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ COPY gpgparams entrypoint.sh PACKAGE /protonmail/
|
|||||||
COPY --from=build /protonmail.deb /tmp/protonmail.deb
|
COPY --from=build /protonmail.deb /tmp/protonmail.deb
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends /tmp/protonmail.deb socat pass libsecret-1-0 ca-certificates procps \
|
&& apt-get install -y --no-install-recommends /tmp/protonmail.deb socat pass libsecret-1-0 libfido2-1 ca-certificates procps \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
CMD ["bash", "/protonmail/entrypoint.sh"]
|
CMD ["bash", "/protonmail/entrypoint.sh"]
|
||||||
|
|||||||
Reference in New Issue
Block a user