From 482a52cb5e0f27de1c18f290eb69ebba65b77088 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Thu, 11 Jun 2020 19:44:44 +0300
Subject: [PATCH] Fix using edge repos in docker image. Fixes #482

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

diff --git a/Dockerfile b/Dockerfile
index 91d29ce4..eecf59ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,9 @@
 FROM dock.mau.dev/tulir/lottieconverter:alpine-3.12
 
-RUN echo "@edge_testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
-RUN echo "@edge_community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
+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 \
       python3 py3-pip py3-setuptools py3-wheel \
@@ -10,12 +12,11 @@ RUN apk add --no-cache \
       py3-aiohttp \
       py3-magic \
       py3-sqlalchemy \
-      py3-telethon-session-sqlalchemy@edge_testing \
-      py3-alembic@edge_testing \
-        py3-python-editor@edge_community \
+      py3-telethon-session-sqlalchemy@edge \
+      py3-alembic@edge \
       py3-psycopg2 \
       py3-ruamel.yaml \
-      py3-commonmark@edge_testing \
+      py3-commonmark@edge \
       # Indirect dependencies
       py3-idna \
       #moviepy
@@ -24,7 +25,7 @@ RUN apk add --no-cache \
         py3-requests \
         #imageio
           py3-numpy \
-      py3-telethon@edge_testing \
+      py3-telethon@edge \
         # Optional for socks proxies
         py3-pysocks \
         # cryptg
@@ -47,8 +48,8 @@ RUN apk add --no-cache \
       #py3-aiofiles \ # (too new)
       py3-cachetools \
       py3-unpaddedbase64 \
-      py3-h2@edge_testing \
-      py3-logbook@edge_testing
+      py3-h2@edge \
+      py3-logbook@edge
 
 COPY requirements.txt /opt/mautrix-telegram/requirements.txt
 COPY optional-requirements.txt /opt/mautrix-telegram/optional-requirements.txt