From 96e3bd4a5fa6680edc4496ea39f2b471fd502bfa Mon Sep 17 00:00:00 2001 From: Disassembler Date: Thu, 28 Dec 2017 09:45:21 +0100 Subject: [PATCH] Replace CVUT Alpine repo with CDN as CVUT is down at the moment --- alpine.sh | 10 +++++----- ckan-datapusher/Dockerfile | 2 +- ckan/Dockerfile | 4 ++-- cts/Dockerfile | 2 +- postgres/Dockerfile | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/alpine.sh b/alpine.sh index a56e87e..70099aa 100755 --- a/alpine.sh +++ b/alpine.sh @@ -6,11 +6,11 @@ # Set up repositories cat </etc/apk/repositories -http://repository.fit.cvut.cz/mirrors/alpine/v3.7/main -http://repository.fit.cvut.cz/mirrors/alpine/v3.7/community -#http://repository.fit.cvut.cz/mirrors/alpine/edge/main -#http://repository.fit.cvut.cz/mirrors/alpine/edge/community -#http://repository.fit.cvut.cz/mirrors/alpine/edge/testing +http://dl-cdn.alpinelinux.org/alpine/v3.7/main +http://dl-cdn.alpinelinux.org/alpine/v3.7/community +#http://dl-cdn.alpinelinux.org/alpine/edge/main +#http://dl-cdn.alpinelinux.org/alpine/edge/community +#http://dl-cdn.alpinelinux.org/alpine/edge/testing EOF # Install disk management tools diff --git a/ckan-datapusher/Dockerfile b/ckan-datapusher/Dockerfile index 603e68b..724dd6b 100644 --- a/ckan-datapusher/Dockerfile +++ b/ckan-datapusher/Dockerfile @@ -6,7 +6,7 @@ RUN \ apk --no-cache add python2 RUN \ - # Install runtime XML dependencies (shared with CKAN) + # Install runtime XML dependencies apk --no-cache add libxml2 libxslt RUN \ diff --git a/ckan/Dockerfile b/ckan/Dockerfile index a9a315d..3867175 100644 --- a/ckan/Dockerfile +++ b/ckan/Dockerfile @@ -6,7 +6,7 @@ RUN \ apk --no-cache add python2 RUN \ - # Install runtime XML dependencies (shared with CKAN DataPusher) + # Install runtime XML dependencies apk --no-cache add libxml2 libxslt RUN \ @@ -15,7 +15,7 @@ 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://repository.fit.cvut.cz/mirrors/alpine/edge/testing' >>/etc/apk/repositories \ + && 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 \ diff --git a/cts/Dockerfile b/cts/Dockerfile index 3faaec2..7c8e0d3 100644 --- a/cts/Dockerfile +++ b/cts/Dockerfile @@ -11,7 +11,7 @@ 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://repository.fit.cvut.cz/mirrors/alpine/edge/testing' >>/etc/apk/repositories \ + && 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 \ diff --git a/postgres/Dockerfile b/postgres/Dockerfile index c57414f..9d3069f 100644 --- a/postgres/Dockerfile +++ b/postgres/Dockerfile @@ -6,7 +6,7 @@ RUN \ 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 'http://repository.fit.cvut.cz/mirrors/alpine/edge/testing' >>/etc/apk/repositories \ + && echo 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \ # Install PostgreSQL + PostGIS && apk --no-cache add postgresql postgresql-contrib postgis \ # Create socket directory