diff --git a/ghost/Dockerfile b/ghost/Dockerfile index 7702d65..e9f7521 100644 --- a/ghost/Dockerfile +++ b/ghost/Dockerfile @@ -1,6 +1,6 @@ -FROM alpine:edge +FROM alpine:3.5 -ARG GHOST_VERSION=0.11.7 +ARG GHOST_VERSION=0.11.8 ENV GHOST_NODE_VERSION_CHECK=false \ GID=991 \ @@ -34,7 +34,6 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a tini@commuedge \ su-exec \ nodejs \ - nodejs-npm \ && wget -q https://github.com/TryGhost/Ghost/releases/download/${GHOST_VERSION}/Ghost-${GHOST_VERSION}.zip -P /tmp \ && unzip -q /tmp/Ghost-${GHOST_VERSION}.zip -d /ghost \ && cd /ghost \ diff --git a/libresonic/Dockerfile b/libresonic/Dockerfile index 8b06ff7..929e508 100644 --- a/libresonic/Dockerfile +++ b/libresonic/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:edge +FROM alpine:3.5 ARG VERSION=6.2.beta3 @@ -6,7 +6,7 @@ ENV UID=991 GID=991 WORKDIR /libresonic -RUN echo "@community https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ +RUN echo "@community https://nl.alpinelinux.org/alpine/v3.5/community" >> /etc/apk/repositories \ && apk -U upgrade && apk add \ ffmpeg \ su-exec \ diff --git a/nextcloud/11.0/Dockerfile b/nextcloud/11.0/Dockerfile index 37d184b..c2440e5 100644 --- a/nextcloud/11.0/Dockerfile +++ b/nextcloud/11.0/Dockerfile @@ -1,8 +1,8 @@ -FROM alpine:edge +FROM alpine:3.5 -ARG NEXTCLOUD_VERSION=11.0.2 +ARG NEXTCLOUD_VERSION=11.0.3 ARG GNU_LIBICONV_VERSION=1.15 -ARG PHP_SOURCES_VERSION=7.1.3 +ARG PHP_SOURCES_VERSION=7.0.18 ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372 792E D758 99B9 A724 937A" ENV UID=991 GID=991 \ @@ -16,8 +16,7 @@ ENV UID=991 GID=991 \ DB_TYPE=sqlite3 \ DOMAIN=localhost -RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ - && BUILD_DEPS=" \ +RUN BUILD_DEPS=" \ gnupg \ tar \ build-base \ @@ -36,49 +35,47 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/r samba-client \ su-exec \ tzdata \ - php7@testing \ - php7-fpm@testing \ - php7-intl@testing \ - php7-mbstring@testing \ - php7-curl@testing \ - php7-gd@testing \ - php7-fileinfo@testing \ - php7-mcrypt@testing \ - php7-opcache@testing \ - php7-json@testing \ - php7-session@testing \ - php7-pdo@testing \ - php7-dom@testing \ - php7-ctype@testing \ - php7-mysqlnd@testing \ - php7-pdo_mysql@testing \ - php7-pdo_pgsql@testing \ - php7-pgsql@testing \ - php7-pdo_sqlite@testing \ - php7-sqlite3@testing \ - php7-zlib@testing \ - php7-zip@testing \ - php7-xmlreader@testing \ - php7-xml@testing \ - php7-xmlwriter@testing \ - php7-posix@testing \ - php7-openssl@testing \ - php7-ldap@testing \ - php7-imap@testing \ - php7-ftp@testing \ - php7-pcntl@testing \ - php7-exif@testing \ - php7-pear@testing \ - php7-dev@testing \ - && pecl install smbclient apcu redis \ + php7 \ + php7-fpm \ + php7-intl \ + php7-mbstring \ + php7-curl \ + php7-gd \ + php7-mcrypt \ + php7-opcache \ + php7-json \ + php7-session \ + php7-pdo \ + php7-dom \ + php7-ctype \ + php7-mysqlnd \ + php7-pdo_mysql \ + php7-pdo_pgsql \ + php7-pgsql \ + php7-pdo_sqlite \ + php7-sqlite3 \ + php7-zlib \ + php7-zip \ + php7-xmlreader \ + php7-xml \ + php7-posix \ + php7-openssl \ + php7-ldap \ + php7-imap \ + php7-ftp \ + php7-pcntl \ + php7-exif \ + php7-pear \ + php7-dev \ + && sed -i "$ s|\-n||g" /usr/bin/pecl && pecl install smbclient apcu redis \ && cd /tmp && wget -q http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${GNU_LIBICONV_VERSION}.tar.gz \ && tar xzf libiconv-${GNU_LIBICONV_VERSION}.tar.gz && cd libiconv-${GNU_LIBICONV_VERSION} \ && ./configure --prefix=/usr/local \ && make && make install && libtool --finish /usr/local/lib && cd /tmp \ - && wget -q http://is1.php.net/get/php-${PHP_SOURCES_VERSION}.tar.gz/from/this/mirror -O php7.tar.gz \ + && wget -q http://ch1.php.net/get/php-${PHP_SOURCES_VERSION}.tar.gz/from/this/mirror -O php7.tar.gz \ && tar xzf php7.tar.gz && cd /tmp/php-${PHP_SOURCES_VERSION}/ext/iconv && phpize7 \ && ./configure --with-iconv=/usr/local --with-php-config=/usr/bin/php-config7 \ - && make && cp modules/iconv.so /usr/lib/php7 && cd /tmp \ + && make && cp modules/iconv.so /usr/lib/php7/modules && cd /tmp \ && echo "extension=iconv.so" > /etc/php7/conf.d/00_iconv.ini \ && echo "extension=smbclient.so" > /etc/php7/conf.d/00_smbclient.ini \ && echo "extension=redis.so" > /etc/php7/conf.d/redis.ini \ diff --git a/nextcloud/README.md b/nextcloud/README.md index 6838d1a..f51d200 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -12,8 +12,8 @@ **This image was made for my own use and I have no intention to make this official. Support won't be regular so if there's an update, or a fix, you can open a pull request. Any contribution is welcome, but please be aware I'm very busy currently. Before opening an issue, please check if there's already one related. Also please use Github instead of Docker Hub, otherwise I won't see your comments. Thanks.** ### Features -- Based on Alpine Linux Edge. -- Bundled with nginx and PHP 7.1. +- Based on Alpine Linux. +- Bundled with nginx and PHP 7. - Automatic installation using environment variables. - Package integrity (SHA512) and authenticity (PGP) checked during building process. - Data and apps persistence. diff --git a/nextcloud/daily/Dockerfile b/nextcloud/daily/Dockerfile index 64139ab..5b649c5 100644 --- a/nextcloud/daily/Dockerfile +++ b/nextcloud/daily/Dockerfile @@ -1,7 +1,7 @@ -FROM alpine:edge +FROM alpine:3.5 ARG GNU_LIBICONV_VERSION=1.15 -ARG PHP_SOURCES_VERSION=7.1.3 +ARG PHP_SOURCES_VERSION=7.0.18 ENV UID=991 GID=991 \ UPLOAD_MAX_SIZE=10G \ @@ -14,7 +14,7 @@ ENV UID=991 GID=991 \ DB_TYPE=sqlite3 \ DOMAIN=localhost -RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ +RUN echo " https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ && BUILD_DEPS=" \ gnupg \ tar \ @@ -34,40 +34,40 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/r samba-client \ su-exec \ tzdata \ - php7@testing \ - php7-fpm@testing \ - php7-intl@testing \ - php7-mbstring@testing \ - php7-curl@testing \ - php7-gd@testing \ - php7-fileinfo@testing \ - php7-mcrypt@testing \ - php7-opcache@testing \ - php7-json@testing \ - php7-session@testing \ - php7-pdo@testing \ - php7-dom@testing \ - php7-ctype@testing \ - php7-mysqlnd@testing \ - php7-pdo_mysql@testing \ - php7-pdo_pgsql@testing \ - php7-pgsql@testing \ - php7-pdo_sqlite@testing \ - php7-sqlite3@testing \ - php7-zlib@testing \ - php7-zip@testing \ - php7-xmlreader@testing \ - php7-xml@testing \ - php7-xmlwriter@testing \ - php7-posix@testing \ - php7-openssl@testing \ - php7-ldap@testing \ - php7-imap@testing \ - php7-ftp@testing \ - php7-pcntl@testing \ - php7-exif@testing \ - php7-pear@testing \ - php7-dev@testing \ + php7 \ + php7-fpm \ + php7-intl \ + php7-mbstring \ + php7-curl \ + php7-gd \ + php7-fileinfo \ + php7-mcrypt \ + php7-opcache \ + php7-json \ + php7-session \ + php7-pdo \ + php7-dom \ + php7-ctype \ + php7-mysqlnd \ + php7-pdo_mysql \ + php7-pdo_pgsql \ + php7-pgsql \ + php7-pdo_sqlite \ + php7-sqlite3 \ + php7-zlib \ + php7-zip \ + php7-xmlreader \ + php7-xml \ + php7-xmlwriter \ + php7-posix \ + php7-openssl \ + php7-ldap \ + php7-imap \ + php7-ftp \ + php7-pcntl \ + php7-exif \ + php7-pear \ + php7-dev \ && pecl install smbclient apcu redis \ && cd /tmp && wget -q http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${GNU_LIBICONV_VERSION}.tar.gz \ && tar xzf libiconv-${GNU_LIBICONV_VERSION}.tar.gz && cd libiconv-${GNU_LIBICONV_VERSION} \ @@ -76,7 +76,7 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/r && wget -q http://is1.php.net/get/php-${PHP_SOURCES_VERSION}.tar.gz/from/this/mirror -O php7.tar.gz \ && tar xzf php7.tar.gz && cd /tmp/php-${PHP_SOURCES_VERSION}/ext/iconv && phpize7 \ && ./configure --with-iconv=/usr/local --with-php-config=/usr/bin/php-config7 \ - && make && cp modules/iconv.so /usr/lib/php7 && cd /tmp \ + && make && cp modules/iconv.so /usr/lib/php7/modules && cd /tmp \ && echo "extension=iconv.so" > /etc/php7/conf.d/00_iconv.ini \ && echo "extension=smbclient.so" > /etc/php7/conf.d/00_smbclient.ini \ && echo "extension=redis.so" > /etc/php7/conf.d/redis.ini \ diff --git a/piwik/Dockerfile b/piwik/Dockerfile index 2135ca3..d146d5b 100644 --- a/piwik/Dockerfile +++ b/piwik/Dockerfile @@ -1,12 +1,11 @@ -FROM alpine:edge +FROM alpine:3.5 ARG VERSION=3.0.3 ARG GPG_matthieu="814E 346F A01A 20DB B04B 6807 B5DB D592 5590 A237" ENV UID=991 GID=991 -RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ - && BUILD_DEPS=" \ +RUN BUILD_DEPS=" \ git \ tar \ build-base \ @@ -22,23 +21,23 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/r su-exec \ geoip \ tzdata \ - php7-fpm@testing \ - php7-gd@testing \ - php7-curl@testing \ - php7-session@testing \ - php7-json@testing \ - php7-ctype@testing \ - php7-mbstring@testing \ - php7-iconv@testing \ - php7-zlib@testing \ - php7-dom@testing \ - php7-openssl@testing \ - php7-mysqli@testing \ - php7-mysqlnd@testing \ - php7-pdo@testing \ - php7-pdo_mysql@testing \ - php7-dev@testing \ - php7-pear@testing \ + php7-fpm \ + php7-gd \ + php7-curl \ + php7-session \ + php7-json \ + php7-ctype \ + php7-mbstring \ + php7-iconv \ + php7-zlib \ + php7-dom \ + php7-openssl \ + php7-mysqli \ + php7-mysqlnd \ + php7-pdo \ + php7-pdo_mysql \ + php7-dev \ + php7-pear \ && sed -i "$ s|\-n||g" /usr/bin/pecl && pecl install geoip-1.1.1 \ && echo 'extension=geoip.so' >> /etc/php7/conf.d/00_geoip.ini \ && echo 'geoip.custom_directory=/piwik/misc' >> /etc/php7/php.ini \ diff --git a/privatebin/Dockerfile b/privatebin/Dockerfile index 53bb6dc..ce9d56a 100644 --- a/privatebin/Dockerfile +++ b/privatebin/Dockerfile @@ -1,19 +1,19 @@ -FROM alpine:edge +FROM alpine:3.5 ENV GID=991 UID=991 -RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ +RUN echo " https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ && BUILD_DEPS="tar libressl ca-certificates" \ && apk -U upgrade && apk add \ $BUILD_DEPS \ nginx \ s6 \ su-exec \ - php7-fpm@testing \ - php7-gd@testing \ - php7-mcrypt@testing \ - php7-json@testing \ - php7-zlib@testing \ + php7-fpm \ + php7-gd \ + php7-mcrypt \ + php7-json \ + php7-zlib \ && 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/rtorrent-flood/Dockerfile b/rtorrent-flood/Dockerfile index 064beae..9326056 100644 --- a/rtorrent-flood/Dockerfile +++ b/rtorrent-flood/Dockerfile @@ -1,9 +1,10 @@ -FROM alpine:edge +FROM alpine:3.5 ARG RTORRENT_VER=0.9.6 ARG LIBTORRENT_VER=0.13.6 ARG MEDIAINFO_VER=0.7.94 ARG FILEBOT_VER=4.7.9 +ARG FLOOD_VER=1.0.0 ARG BUILD_CORES ENV UID=991 GID=991 \ @@ -42,7 +43,6 @@ RUN NB_CORES=${BUILD_CORES-`getconf _NPROCESSORS_CONF`} \ su-exec \ python \ nodejs \ - nodejs-npm \ && apk add -X http://dl-cdn.alpinelinux.org/alpine/v3.4/community -U openjdk8-jre==8.111.14-r0 openjdk8-jre-base==8.111.14-r0 openjdk8-jre-lib==8.111.14-r0 \ && cd /tmp && mkdir libtorrent rtorrent \ && cd libtorrent && wget -qO- https://github.com/rakshasa/libtorrent/archive/${LIBTORRENT_VER}.tar.gz | tar xz --strip 1 \ @@ -70,7 +70,7 @@ RUN NB_CORES=${BUILD_CORES-`getconf _NPROCESSORS_CONF`} \ && mkdir /filebot && cd /filebot \ && wget -q https://netcologne.dl.sourceforge.net/project/filebot/filebot/FileBot_${FILEBOT_VER}/FileBot_${FILEBOT_VER}-portable.tar.xz \ && tar xJf FileBot_${FILEBOT_VER}-portable.tar.xz && rm FileBot_${FILEBOT_VER}-portable.tar.xz \ - && cd /usr && git clone https://github.com/jfurrow/flood && cd flood \ + && mkdir /usr/flood && cd /usr/flood && wget -qO- https://github.com/jfurrow/flood/archive/v${FLOOD_VER}.tar.gz | tar xz --strip 1 \ && npm install --production \ && apk del ${BUILD_DEPS} \ && rm -rf /var/cache/apk/* /tmp/* diff --git a/searx/Dockerfile b/searx/Dockerfile index fe2deaa..2d18df5 100644 --- a/searx/Dockerfile +++ b/searx/Dockerfile @@ -1,9 +1,9 @@ -FROM alpine:edge +FROM alpine:3.5 ENV BASE_URL=False IMAGE_PROXY=False \ UID=991 GID=991 -RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ +RUN echo "@community https://nl.alpinelinux.org/alpine/v3.5/community" >> /etc/apk/repositories \ && BUILD_DEPS=" \ build-base \ python-dev \ @@ -20,7 +20,7 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a libxml2 \ libxslt \ openssl \ - tini@commuedge \ + tini@community \ py2-pip \ && pip install --no-cache -r https://raw.githubusercontent.com/asciimoo/searx/master/requirements.txt \ && mkdir /usr/local/searx && cd /usr/local/searx \