From 74b7d9478f29914a66ce205470f610bdede708d4 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Fri, 21 Sep 2018 09:17:19 +0200
Subject: [PATCH] Include edge repos in basic alpine image

---
 basic-runtimes/alpine.lxcfile | 8 +++++++-
 ckan/lxcfile                  | 5 +----
 cts/lxcfile                   | 5 +----
 postgres/lxcfile              | 5 +----
 rabbitmq/lxcfile              | 5 +----
 sahana/lxcfile                | 5 +----
 6 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/basic-runtimes/alpine.lxcfile b/basic-runtimes/alpine.lxcfile
index b8dcc5d..74f0702 100644
--- a/basic-runtimes/alpine.lxcfile
+++ b/basic-runtimes/alpine.lxcfile
@@ -2,5 +2,11 @@ IMAGE build
 LAYER shared/alpine
 
 RUN EOF
-    apk --no-cache add s6
+    # Add edge/testing repository
+    echo '@em http://dl-cdn.alpinelinux.org/alpine/edge/main' >>/etc/apk/repositories
+    echo '@et http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories
+    echo '@ec http://dl-cdn.alpinelinux.org/alpine/edge/community' >>/etc/apk/repositories
+
+    # Install s6 supervisor
+    apk --no-cache add s6@em
 EOF
diff --git a/ckan/lxcfile b/ckan/lxcfile
index 381bada..537df2b 100644
--- a/ckan/lxcfile
+++ b/ckan/lxcfile
@@ -5,11 +5,8 @@ LAYER shared/python2
 LAYER ckan/ckan
 
 RUN EOF
-    # Add edge/testing repository
-    echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories
-
     # Install runtime dependencies
-    apk --no-cache add geos@edge libjpeg-turbo libmagic libpq mailcap py2-pip zlib
+    apk --no-cache add geos@et libjpeg-turbo libmagic libpq mailcap py2-pip zlib
 
     # Install build dependencies
     apk --no-cache add --virtual .deps build-base git libjpeg-turbo-dev libxml2-dev libxslt-dev postgresql-dev python2-dev zlib-dev
diff --git a/cts/lxcfile b/cts/lxcfile
index 8964727..a765630 100644
--- a/cts/lxcfile
+++ b/cts/lxcfile
@@ -5,11 +5,8 @@ LAYER shared/python2
 LAYER cts/cts
 
 RUN EOF
-    # Add edge/testing repository
-    echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories
-
     # Install runtime dependencies
-    apk --no-cache add geos@edge libpq nginx zlib
+    apk --no-cache add geos@et libpq nginx zlib
 
     # Install build dependencies
     apk --no-cache add --virtual .deps build-base git postgresql-dev python2-dev py2-pip zlib-dev
diff --git a/postgres/lxcfile b/postgres/lxcfile
index 7657628..20186a1 100644
--- a/postgres/lxcfile
+++ b/postgres/lxcfile
@@ -7,11 +7,8 @@ RUN EOF
     sed -i 's/postgres:x:70:70/postgres:x:5432:5432/' /etc/passwd
     sed -i 's/postgres:x:70/postgres:x:5432/' /etc/group
 
-    # Add edge/testing repository for postgis support
-    echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories
-
     # Install PostgreSQL + PostGIS
-    apk --no-cache add postgresql postgresql-contrib postgis@edge
+    apk --no-cache add postgresql postgresql-contrib postgis@et
 
     # Create socket directory 
     mkdir /run/postgresql
diff --git a/rabbitmq/lxcfile b/rabbitmq/lxcfile
index 1c68eee..efc7b27 100644
--- a/rabbitmq/lxcfile
+++ b/rabbitmq/lxcfile
@@ -7,11 +7,8 @@ RUN EOF
     addgroup -S -g 5672 rabbitmq
     adduser -S -u 5672 -h /usr/lib/rabbitmq -s /bin/false -g rabbitmq -G rabbitmq rabbitmq
 
-    # Add edge/testing repository
-    echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories
-
     # Install RabbitMQ
-    apk --no-cache add rabbitmq-server@edge
+    apk --no-cache add rabbitmq-server@et
 EOF
 
 MOUNT DIR /srv/rabbitmq/data var/lib/rabbitmq/mnesia
diff --git a/sahana/lxcfile b/sahana/lxcfile
index 1689de7..5b1e63a 100644
--- a/sahana/lxcfile
+++ b/sahana/lxcfile
@@ -5,11 +5,8 @@ LAYER shared/python2
 LAYER sahana/sahana
 
 RUN EOF
-    # Add edge/testing repository
-    echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories
-
     # Install runtime dependencies
-    apk --no-cache add geos@edge nginx py-gdal@edge py2-dateutil py2-lxml py2-numpy py2-pillow py2-psycopg2 py2-requests uwsgi-python
+    apk --no-cache add geos@et nginx py-gdal@et py2-dateutil py2-lxml py2-numpy py2-pillow py2-psycopg2 py2-requests uwsgi-python
 
     # Install build dependencies
     apk --no-cache add --virtual .deps build-base git freetype-dev libpng-dev py-numpy-dev py2-pip python2-dev ttf-dejavu