remove build.sh because its not neaded and move sed into Dockerfile
This commit is contained in:
+6
-7
@@ -12,21 +12,20 @@ RUN apt-get update && apt-get install -y \
|
|||||||
# Build
|
# Build
|
||||||
ADD https://github.com/ProtonMail/proton-bridge.git#${VERSION} /build/
|
ADD https://github.com/ProtonMail/proton-bridge.git#${VERSION} /build/
|
||||||
WORKDIR /build/
|
WORKDIR /build/
|
||||||
RUN make build-nogui vault-editor
|
RUN sed -i 's/127.0.0.1/0.0.0.0/g' internal/constants/constants.go
|
||||||
|
RUN set -eux; \
|
||||||
COPY build.sh /build/
|
make build-nogui vault-editor
|
||||||
RUN bash build.sh
|
|
||||||
|
|
||||||
FROM ubuntu:latest
|
FROM ubuntu:latest
|
||||||
LABEL maintainer="Xiaonan Shen <s@sxn.dev>"
|
LABEL maintainer="Xiaonan Shen <s@sxn.dev>"
|
||||||
|
|
||||||
EXPOSE 25/tcp
|
EXPOSE 1025/tcp
|
||||||
EXPOSE 143/tcp
|
EXPOSE 1143/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 \
|
&& apt-get install -y --no-install-recommends \
|
||||||
socat pass libsecret-1-0 ca-certificates libfido2-1 \
|
pass libsecret-1-0 ca-certificates libfido2-1 \
|
||||||
dbus dbus-x11 gnupg2 \
|
dbus dbus-x11 gnupg2 \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -ex
|
|
||||||
|
|
||||||
# Clone new code
|
|
||||||
sed -i 's/127.0.0.1/0.0.0.0/g' internal/constants/constants.go
|
|
||||||
|
|
||||||
ARCH=$(uname -m)
|
|
||||||
if [[ $ARCH == "armv7l" ]] ; then
|
|
||||||
# This is expected to fail, and we use the following patch to fix
|
|
||||||
make build-nogui || true
|
|
||||||
# For 32bit architectures, there was a overflow error on the parser
|
|
||||||
# This is a workaround for this problem found at:
|
|
||||||
# https://github.com/antlr/antlr4/issues/2433#issuecomment-774514106
|
|
||||||
find $(go env GOPATH)/pkg/mod/github.com/\!proton\!mail/go-rfc5322*/ -type f -exec sed -i.bak 's/(1<</(int64(1)<</g' {} +
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Build
|
|
||||||
make build-nogui
|
|
||||||
Reference in New Issue
Block a user