From c6a1af2f5a4effbdaa051b5bd53fb0f514374185 Mon Sep 17 00:00:00 2001 From: Wonderfall Date: Sat, 27 Aug 2016 21:06:23 +0200 Subject: [PATCH] php7-* moved to commuedge --- boinc/Dockerfile | 2 +- boring-nginx/Dockerfile | 2 +- lychee/Dockerfile | 23 +++++++++++------------ nginx/Dockerfile | 2 +- nodejs/lts/Dockerfile | 2 +- nodejs/stable/Dockerfile | 2 +- privatebin/Dockerfile | 13 ++++++------- rainloop/Dockerfile | 25 ++++++++++++------------- rutorrent/Dockerfile | 9 ++++----- subsonic/Dockerfile | 2 +- tor/Dockerfile | 2 +- 11 files changed, 40 insertions(+), 44 deletions(-) diff --git a/boinc/Dockerfile b/boinc/Dockerfile index b40189d..8ea3142 100644 --- a/boinc/Dockerfile +++ b/boinc/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:3.4 MAINTAINER Wonderfall ARG BOINC_USER_ID=35854 diff --git a/boring-nginx/Dockerfile b/boring-nginx/Dockerfile index e35a6a6..cca318a 100644 --- a/boring-nginx/Dockerfile +++ b/boring-nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:3.4 MAINTAINER Wonderfall ENV UID=991 GID=991 diff --git a/lychee/Dockerfile b/lychee/Dockerfile index 338c19a..d31fac2 100644 --- a/lychee/Dockerfile +++ b/lychee/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:3.4 MAINTAINER Wonderfall ARG LYCHEE_VERSION=3.1.2 @@ -7,7 +7,6 @@ ARG IMAGICK_EXT_VERSION=3.4.2 ENV UID=991 GID=991 RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ - && echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ && BUILD_DEPS=" \ imagemagick-dev \ tar \ @@ -20,16 +19,16 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a ${BUILD_DEPS} \ nginx \ libwebp \ - php7-mbstring@testing \ - php7-fpm@testing \ - php7-exif@testing \ - php7-gd@testing \ - php7-json@testing \ - php7-mysqli@testing \ - php7-zip@testing \ - php7-session@testing \ - php7-pear@testing \ - php7-dev@testing \ + php7-mbstring@commuedge \ + php7-fpm@commuedge \ + php7-exif@commuedge \ + php7-gd@commuedge \ + php7-json@commuedge \ + php7-mysqli@commuedge \ + php7-zip@commuedge \ + php7-session@commuedge \ + php7-pear@commuedge \ + php7-dev@commuedge \ supervisor \ imagemagick \ tini@commuedge \ diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 0fbfc14..b27a0d0 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:3.4 MAINTAINER Wonderfall ENV UID=991 GID=991 diff --git a/nodejs/lts/Dockerfile b/nodejs/lts/Dockerfile index 07b8f7b..53b8056 100644 --- a/nodejs/lts/Dockerfile +++ b/nodejs/lts/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:3.4 MAINTAINER Wonderfall ARG NODE_VERSION=4.5.0 diff --git a/nodejs/stable/Dockerfile b/nodejs/stable/Dockerfile index 7fe5492..a7d8062 100644 --- a/nodejs/stable/Dockerfile +++ b/nodejs/stable/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:3.4 MAINTAINER Wonderfall ARG NODE_VERSION=6.4.0 diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile index 1c36cbc..1735125 100644 --- a/privatebin/Dockerfile +++ b/privatebin/Dockerfile @@ -1,21 +1,20 @@ -FROM alpine:edge +FROM alpine:3.4 MAINTAINER Wonderfall ENV GID=991 UID=991 RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ - && echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ && BUILD_DEPS="tar openssl ca-certificates" \ && apk -U add \ $BUILD_DEPS \ nginx \ supervisor \ tini@commuedge \ - php7-fpm@testing \ - php7-gd@testing \ - php7-mcrypt@testing \ - php7-json@testing \ - php7-zlib@testing \ + php7-fpm@commuedge \ + php7-gd@commuedge \ + php7-mcrypt@commuedge \ + php7-json@commuedge \ + php7-zlib@commuedge \ && mkdir zerobin && cd zerobin \ && wget -qO- https://github.com/PrivateBin/PrivateBin/archive/master.tar.gz | tar xz --strip 1 \ && mv cfg/conf.ini.sample cfg/conf.ini \ diff --git a/rainloop/Dockerfile b/rainloop/Dockerfile index 3708608..66bbd28 100644 --- a/rainloop/Dockerfile +++ b/rainloop/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:3.4 MAINTAINER Wonderfall ARG GPG_rainloop="3B79 7ECE 694F 3B7B 70F3 11A4 ED7C 49D9 87DA 4591" @@ -6,23 +6,22 @@ ARG GPG_rainloop="3B79 7ECE 694F 3B7B 70F3 11A4 ED7C 49D9 87DA 4591" ENV GID=991 UID=991 RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ - && echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ && apk -U add \ gnupg \ nginx \ supervisor \ tini@commuedge \ - php7-fpm@testing \ - php7-curl@testing \ - php7-iconv@testing \ - php7-xml@testing \ - php7-dom@testing \ - php7-openssl@testing \ - php7-json@testing \ - php7-zlib@testing \ - php7-pdo_mysql@testing \ - php7-pdo_sqlite@testing \ - php7-sqlite3@testing \ + php7-fpm@commuedge \ + php7-curl@commuedge \ + php7-iconv@commuedge \ + php7-xml@commuedge \ + php7-dom@commuedge \ + php7-openssl@commuedge \ + php7-json@commuedge \ + php7-zlib@commuedge \ + php7-pdo_mysql@commuedge \ + php7-pdo_sqlite@commuedge \ + php7-sqlite3@commuedge \ && cd /tmp \ && wget -q http://repository.rainloop.net/v2/webmail/rainloop-community-latest.zip \ && wget -q http://repository.rainloop.net/v2/webmail/rainloop-community-latest.zip.asc \ diff --git a/rutorrent/Dockerfile b/rutorrent/Dockerfile index 6e843f5..6ddcc99 100644 --- a/rutorrent/Dockerfile +++ b/rutorrent/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:3.4 MAINTAINER xataz MAINTAINER Wonderfall @@ -14,7 +14,6 @@ ENV UID=991 \ PKG_CONFIG_PATH=/usr/local/lib/pkgconfig RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ - && echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ && NB_CORES=${BUILD_CORES-`getconf _NPROCESSORS_CONF`} \ && BUILD_DEPS=" \ build-base \ @@ -35,9 +34,9 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a ffmpeg \ ca-certificates \ nginx \ - php7@testing \ - php7-fpm@testing \ - php7-json@testing \ + php7@commuedge \ + php7-fpm@commuedge \ + php7-json@commuedge \ curl \ gzip \ zip \ diff --git a/subsonic/Dockerfile b/subsonic/Dockerfile index 5b56920..75f8250 100644 --- a/subsonic/Dockerfile +++ b/subsonic/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:3.4 MAINTAINER Wonderfall ARG VERSION=6.0 diff --git a/tor/Dockerfile b/tor/Dockerfile index 9f94fa4..7ff1486 100644 --- a/tor/Dockerfile +++ b/tor/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:3.4 ARG TOR_VERSION=0.2.8.7 ARG TOR_USER_ID=45553