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

---
 Dockerfile | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6b10413..47df64a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,9 @@
 FROM docker.io/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 \
@@ -13,9 +15,8 @@ RUN apk add --no-cache \
       py3-ruamel.yaml \
       imagemagick \
       # Indirect dependencies
-      py3-commonmark@edge_testing \
-      py3-alembic@edge_testing \
-        py3-python-editor@edge_community \
+      py3-commonmark@edge \
+      py3-alembic@edge \
       #fbchat
         py3-beautifulsoup4 \
         py3-paho-mqtt \
@@ -32,9 +33,9 @@ RUN apk add --no-cache \
       #py3-aiofiles \ # (too new)
       py3-cachetools \
       py3-unpaddedbase64 \
-      py3-h2@edge_testing \
-      py3-pyaes@edge_testing \
-      py3-logbook@edge_testing \
+      py3-h2@edge \
+      py3-pyaes@edge \
+      py3-logbook@edge \
       # Other dependencies
       ca-certificates \
       su-exec
-- 
GitLab