From 90526d837d1ea6789b62a29b151442b04f72a395 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 27 Nov 2018 13:39:11 +0100 Subject: [PATCH] correct config --- Dockerfile | 4 +++- rootfs/etc/confd/templates/config.yaml.tmpl | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c942820..f115cdf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,8 @@ RUN adduser -h /var/lib/matrix-bridge -u 2222 -D -G matrix-bridge matrix-bridge COPY --from=builder /go/bin/mautrix-whatsapp /bin/mautrix-whatsapp +RUN apk --no-cache add ca-certificates + WORKDIR /var/lib/matrix-bridge RUN mkdir /var/lib/matrix-bridge/data @@ -23,5 +25,5 @@ ADD /rootfs / RUN chown -R matrix-bridge:matrix-bridge /var/lib/matrix-bridge ENV HOME /var/lib/matrix-bridge -EXPOSE 9005 +EXPOSE 8080 diff --git a/rootfs/etc/confd/templates/config.yaml.tmpl b/rootfs/etc/confd/templates/config.yaml.tmpl index 7bb5083..edbca87 100644 --- a/rootfs/etc/confd/templates/config.yaml.tmpl +++ b/rootfs/etc/confd/templates/config.yaml.tmpl @@ -36,8 +36,8 @@ appservice: avatar: mxc://maunium.net/NeXNQarUbrlYBiPCpprYsRqr # Authentication tokens for AS <-> HS communication. Autogenerated; do not modify. - as_token: "" - hs_token: "" + as_token: "{{ getenv "AS_TOKEN" }}" + hs_token: {{ getenv "HS_TOKEN" }}" # Bridge config. Currently unused. bridge: