Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Tulir Asokan
mautrix-whatsapp
Commits
592b0862
Commit
592b0862
authored
Oct 19, 2020
by
Tulir Asokan
🐈
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Install yq from alpine repos
parent
38bfafbe
Pipeline
#1697
passed with stages
in 6 minutes and 1 second
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
9 deletions
+11
-9
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
Dockerfile
Dockerfile
+10
-5
crypto.go
crypto.go
+0
-3
No files found.
.gitlab-ci.yml
View file @
592b0862
...
...
@@ -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"
...
...
Dockerfile
View file @
592b0862
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
...
...
crypto.go
View file @
592b0862
...
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment