From 592b0862ceb8980d85977b5cc69814bca81afeba Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Mon, 19 Oct 2020 14:46:59 +0300
Subject: [PATCH] Install yq from alpine repos

---
 .gitlab-ci.yml |  2 +-
 Dockerfile     | 15 ++++++++++-----
 crypto.go      |  3 ---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d87e41..907d00d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ stages:
     paths:
     - .cache
   before_script:
-  - apk add build-base olm-dev
+  - apk add build-base olm-dev && apk policy olm-dev
   - mkdir -p .cache
   - export GOPATH="$CI_PROJECT_DIR/.cache"
   - export GOCACHE="$CI_PROJECT_DIR/.cache/build"
diff --git a/Dockerfile b/Dockerfile
index 7ff17b6..7b4224e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,10 @@
 FROM golang:1-alpine3.12 AS builder
 
+RUN echo $'\
+@edge http://dl-cdn.alpinelinux.org/alpine/edge/main\n\
+@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing\n\
+@edge http://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories
+
 RUN apk add --no-cache git ca-certificates build-base su-exec olm-dev
 
 COPY . /build
@@ -8,15 +13,15 @@ RUN go build -o /usr/bin/mautrix-whatsapp
 
 FROM alpine:3.12
 
-ARG TARGETARCH=amd64
-ARG YQ_DOWNLOAD_ADDR=https://github.com/mikefarah/yq/releases/download/3.3.2/yq_linux_${TARGETARCH}
+RUN echo $'\
+@edge http://dl-cdn.alpinelinux.org/alpine/edge/main\n\
+@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing\n\
+@edge http://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories
 
 ENV UID=1337 \
     GID=1337
 
-RUN apk add --no-cache ffmpeg su-exec ca-certificates olm bash jq curl && \
-    curl -sLo yq ${YQ_DOWNLOAD_ADDR} && \
-    chmod +x yq && mv yq /usr/bin/yq
+RUN apk add --no-cache ffmpeg su-exec ca-certificates olm bash jq yq@edge curl
 
 COPY --from=builder /usr/bin/mautrix-whatsapp /usr/bin/mautrix-whatsapp
 COPY --from=builder /build/example-config.yaml /opt/mautrix-whatsapp/example-config.yaml
diff --git a/crypto.go b/crypto.go
index cf08115..9e92264 100644
--- a/crypto.go
+++ b/crypto.go
@@ -54,9 +54,6 @@ func NewCryptoHelper(bridge *Bridge) Crypto {
 	if !bridge.Config.Bridge.Encryption.Allow {
 		bridge.Log.Debugln("Bridge built with end-to-bridge encryption, but disabled in config")
 		return nil
-	} else if bridge.Config.Bridge.LoginSharedSecret == "" {
-		bridge.Log.Warnln("End-to-bridge encryption enabled, but login_shared_secret not set")
-		return nil
 	}
 	baseLog := bridge.Log.Sub("Crypto")
 	return &CryptoHelper{