From 8662db67b82bf018220dd72d4c1aacb21f49a1c4 Mon Sep 17 00:00:00 2001
From: Dan Pastusek <dan@hexial.com>
Date: Fri, 14 Aug 2020 15:03:15 -0600
Subject: [PATCH 1/3] add jq / yq

---
 Dockerfile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 976dd34f..b7cf3a18 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
 FROM dock.mau.dev/tulir/lottieconverter: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\
@@ -41,7 +43,13 @@ RUN apk add --no-cache \
       olm-dev \
       py3-pycryptodome \
       py3-unpaddedbase64 \
-      py3-future
+      py3-future \
+      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-telegram/requirements.txt
 COPY optional-requirements.txt /opt/mautrix-telegram/optional-requirements.txt

From 3461ee6a7277c450709834220858ff951495ab1d Mon Sep 17 00:00:00 2001
From: Dan Pastusek <dan@hexial.com>
Date: Fri, 14 Aug 2020 15:04:12 -0600
Subject: [PATCH 2/3] remove empty line

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b7cf3a18..8ba5fc52 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,7 +50,6 @@ RUN apk add --no-cache \
   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-telegram/requirements.txt
 COPY optional-requirements.txt /opt/mautrix-telegram/optional-requirements.txt
 WORKDIR /opt/mautrix-telegram

From a06691b2146c5ec93d67e78a341f8f986033b697 Mon Sep 17 00:00:00 2001
From: Dan Pastusek <dan@hexial.com>
Date: Fri, 14 Aug 2020 15:39:53 -0600
Subject: [PATCH 3/3] add TARGETARCH as build arg in ci pipeline

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6fc003b6..d690654b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ build amd64:
   - amd64
   script:
   - docker pull $CI_REGISTRY_IMAGE:latest || true
-  - docker build --pull --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA-amd64 .
+  - docker build --pull --cache-from $CI_REGISTRY_IMAGE:latest --build-arg TARGETARCH=amd64 --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA-amd64 .
   - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA-amd64
   - docker rmi $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA-amd64
 
@@ -24,7 +24,7 @@ build arm64:
   - arm64
   script:
   - docker pull $CI_REGISTRY_IMAGE:latest || true
-  - docker build --pull --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA-arm64 .
+  - docker build --pull --cache-from $CI_REGISTRY_IMAGE:latest --build-arg TARGETARCH=arm64 --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA-arm64 .
   - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA-arm64
   - docker rmi $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA-arm64