From 89bf24d6cfcd6d653a9f5ef41d2aae37ee327897 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Thu, 11 Jan 2018 11:10:12 +0100
Subject: [PATCH] Reorganize edge repo usage in Dockerfiles

---
 ckan/Dockerfile      | 8 ++++----
 cts/Dockerfile       | 8 ++++----
 gnuhealth/Dockerfile | 7 +++----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ckan/Dockerfile b/ckan/Dockerfile
index ade3a61..0b538e3 100644
--- a/ckan/Dockerfile
+++ b/ckan/Dockerfile
@@ -11,14 +11,14 @@ RUN \
 
 RUN \
  # Install runtime dependencies
- apk --no-cache add libjpeg-turbo libmagic libpq py2-pip zlib
+ apk --no-cache add libjpeg-turbo libmagic libpq py2-pip zlib \
+ && echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
+ && apk --no-cache add geos \
+ && sed -i '$ d' /etc/apk/repositories
 
 RUN \
  # Install build dependencies
  apk --no-cache add --virtual .deps git build-base libjpeg-turbo-dev libxml2-dev libxslt-dev postgresql-dev python2-dev zlib-dev \
- # Add edge/testing repository for postgis (geos) support
- && echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
- && apk --no-cache add geos \
  # Hackfix for python find_library('c') call
  && ln -s /lib/ld-musl-x86_64.so.1 /lib/libc.so.1 \
  # Install CKAN
diff --git a/cts/Dockerfile b/cts/Dockerfile
index 0a36740..486162f 100644
--- a/cts/Dockerfile
+++ b/cts/Dockerfile
@@ -7,14 +7,14 @@ RUN \
 
 RUN \
  # Install runtime dependencies
- apk --no-cache add libpq zlib
+ apk --no-cache add libpq zlib \
+ && echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
+ && apk --no-cache add geos \
+ && sed -i '$ d' /etc/apk/repositories
 
 RUN \
  # Install build dependencies
  apk --no-cache add --virtual .deps git build-base postgresql-dev python2-dev py2-pip zlib-dev \
- # Add edge/testing repository for postgis (geos) support
- && echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
- && apk --no-cache add geos \
  # Install CTS
  && git clone --depth 1 https://github.com/theirc/CTS /srv/cts \
  # Force psycopg2 version update for compatibility with PostgreSQL 10
diff --git a/gnuhealth/Dockerfile b/gnuhealth/Dockerfile
index c97cddd..dbf3d2f 100644
--- a/gnuhealth/Dockerfile
+++ b/gnuhealth/Dockerfile
@@ -3,7 +3,8 @@ MAINTAINER Disassembler <disassembler@dasm.cz>
 
 RUN \
  # Install Python3 runtime
- apk --no-cache add python3
+ apk --no-cache add python3 \
+ && ln -s /usr/bin/python3 /usr/bin/python
 
 RUN \
  # Install runtime XML dependencies
@@ -23,9 +24,7 @@ RUN \
  && rm -f /tmp/gnuhealth.tgz \
  # Clone Sao (Tryton web client) repository
  && git clone -b 4.2 --single-branch --depth 1 https://github.com/tryton/sao /srv/gnuhealth/sao \
- # Symlink python binary
- && ln -s /usr/bin/python3 /usr/bin/python \
-# Create OS user
+ # Create OS user
  && addgroup -S -g 8008 gnuhealth \
  && adduser -S -u 8008 -h /srv/gnuhealth -s /bin/bash -g gnuhealth -G gnuhealth gnuhealth \
  && chown -R gnuhealth:gnuhealth /srv/gnuhealth \