From 51d49ebb2afd7991cfda06fe0e1f6684166eee6d Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Mon, 17 Aug 2020 22:09:42 +0300 Subject: [PATCH] Update dockerfile --- Dockerfile | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index ddb143c..3c07683 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM 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\ @@ -21,21 +23,27 @@ RUN apk add --no-cache \ py3-cffi \ 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-twitter/requirements.txt -COPY optional-requirements.txt /opt/mautrix-twitter/optional-requirements.txt -WORKDIR /opt/mautrix-twitter + +COPY requirements.txt /opt/mautrix-amp/requirements.txt +COPY optional-requirements.txt /opt/mautrix-amp/optional-requirements.txt +WORKDIR /opt/mautrix-amp RUN apk add --virtual .build-deps python3-dev libffi-dev build-base \ && pip3 install -r requirements.txt -r optional-requirements.txt \ && apk del .build-deps -COPY . /opt/mautrix-twitter +COPY . /opt/mautrix-amp RUN apk add git && pip3 install .[e2be] && apk del git \ # This doesn't make the image smaller, but it's needed so that the `version` command works properly - && cp mautrix_twitter/example-config.yaml . && rm -rf mautrix_twitter + && cp mautrix_amp/example-config.yaml . && rm -rf mautrix_amp VOLUME /data ENV UID=1337 GID=1337 -CMD ["/opt/mautrix-twitter/docker-run.sh"] +CMD ["/opt/mautrix-amp/docker-run.sh"]