Merge pull request #91 from kubesail/master

add jq / yq, and TARGETARCH to Dockerfile

.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
 

Dockerfile

 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