From 298953da609de1c932f6e1b94efa5fe0d2f50e6e Mon Sep 17 00:00:00 2001
From: Dan Pastusek <dan@hexial.com>
Date: Fri, 14 Aug 2020 14:29:09 -0600
Subject: [PATCH] add jq / yq, and TARGETARCH
---
Dockerfile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 9f6a556..cd6a61c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
FROM docker.io/alpine:3.12
+ARG TARGETARCH=amd64
+
RUN echo $'\
@edge http://dl-cdn.alpinelinux.org/alpine/edge/main\n\
@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing\n\
@@ -32,7 +34,12 @@ RUN apk add --no-cache \
py3-pysocks \
# Other dependencies
ca-certificates \
- su-exec
+ su-exec \
+ bash \
+ curl \
+ jq && \
+ curl -sLo yq https://github.com/mikefarah/yq/releases/download/3.3.2/yq_linux_${TARGETARCH} && \
+ chmod +x yq && mv yq /usr/bin/yq
COPY requirements.txt /opt/mautrix-facebook/requirements.txt
COPY optional-requirements.txt /opt/mautrix-facebook/optional-requirements.txt
--
GitLab