From 9cb7d4404eadc6f12dfe9ae02adf5c70b967c88c Mon Sep 17 00:00:00 2001 From: Wonderfall Date: Thu, 30 Jun 2016 13:15:04 +0200 Subject: [PATCH] use https and get only latest commit with git clone --- boinc/Dockerfile | 2 +- cowrie/Dockerfile | 2 +- ghost/Dockerfile | 2 +- isso/Dockerfile | 2 +- lychee/Dockerfile | 4 ++-- nextcloud/Dockerfile | 4 ++-- nginx/Dockerfile | 6 +++--- piwik/Dockerfile | 4 ++-- rainloop/Dockerfile | 4 ++-- rutorrent/Dockerfile | 18 +++++++++--------- searx/Dockerfile | 2 +- subsonic/Dockerfile | 2 +- zerobin/Dockerfile | 17 ++++++++--------- 13 files changed, 34 insertions(+), 35 deletions(-) diff --git a/boinc/Dockerfile b/boinc/Dockerfile index 0723d39..b40189d 100644 --- a/boinc/Dockerfile +++ b/boinc/Dockerfile @@ -18,7 +18,7 @@ RUN BUILD_DEPS=" \ libstdc++ \ curl \ && cd /tmp \ - && git clone https://github.com/BOINC/boinc.git \ + && git clone https://github.com/BOINC/boinc.git --depth=1 \ && cd boinc \ && ./_autosetup \ && ./configure --disable-server --enable-client CXXFLAGS="-O3 " \ diff --git a/cowrie/Dockerfile b/cowrie/Dockerfile index 80aa4ac..2e10302 100644 --- a/cowrie/Dockerfile +++ b/cowrie/Dockerfile @@ -15,7 +15,7 @@ ENV UID=1000 \ FACING_IP=9.9.9.9 \ JSON_LOG=False -RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ +RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ && BUILD_DEPS=" \ build-base \ libtool \ diff --git a/ghost/Dockerfile b/ghost/Dockerfile index 1910bad..fc1d52a 100644 --- a/ghost/Dockerfile +++ b/ghost/Dockerfile @@ -26,7 +26,7 @@ ENV GHOST_NODE_VERSION_CHECK=false \ VOLUME /ghost/content -RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ +RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ && apk -U add \ openssl \ ca-certificates \ diff --git a/isso/Dockerfile b/isso/Dockerfile index 7eab42c..0bca0c2 100644 --- a/isso/Dockerfile +++ b/isso/Dockerfile @@ -5,7 +5,7 @@ ARG ISSO_VER=0.10.4 ENV GID=1000 UID=1000 -RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ +RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ && BUILD_DEPS=" \ python-dev \ libffi-dev \ diff --git a/lychee/Dockerfile b/lychee/Dockerfile index 9049974..338c19a 100644 --- a/lychee/Dockerfile +++ b/lychee/Dockerfile @@ -6,8 +6,8 @@ ARG IMAGICK_EXT_VERSION=3.4.2 ENV UID=991 GID=991 -RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ - && echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ +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 \ diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 15f71fb..9b3dfe2 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -6,8 +6,8 @@ ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372 792E D758 99B9 A724 937A" ENV GID=991 UID=991 -RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ - && echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ +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="gnupg tar ca-certificates" \ && apk -U add \ ${BUILD_DEPS} \ diff --git a/nginx/Dockerfile b/nginx/Dockerfile index f9d95ba..a610a23 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -35,11 +35,11 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a bind-tools \ tini@commuedge \ && cd /tmp \ - && git clone https://github.com/bagder/libbrotli && cd libbrotli \ + && git clone https://github.com/bagder/libbrotli --depth=1 && cd libbrotli \ && ./autogen.sh && ./configure && make -j ${NB_CORES} && make install \ && cd /tmp \ - && git clone https://github.com/google/ngx_brotli \ - && git clone https://github.com/openresty/headers-more-nginx-module \ + && git clone https://github.com/google/ngx_brotli --depth=1 \ + && git clone https://github.com/openresty/headers-more-nginx-module --depth=1 \ && LIBRESSL_TARBALL="libressl-${LIBRESSL_VERSION}.tar.gz" \ && wget -q http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${LIBRESSL_TARBALL} \ && echo "Verifying ${LIBRESSL_TARBALL} using GPG..." \ diff --git a/piwik/Dockerfile b/piwik/Dockerfile index a467d04..6b2995e 100644 --- a/piwik/Dockerfile +++ b/piwik/Dockerfile @@ -7,8 +7,8 @@ ARG GPG_matthieu="814E 346F A01A 20DB B04B 6807 B5DB D592 5590 A237" ENV GID=991 UID=991 -RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ - && echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ +RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ + && echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ && BUILD_DEPS=" \ git \ tar \ diff --git a/rainloop/Dockerfile b/rainloop/Dockerfile index 604e869..3708608 100644 --- a/rainloop/Dockerfile +++ b/rainloop/Dockerfile @@ -5,8 +5,8 @@ ARG GPG_rainloop="3B79 7ECE 694F 3B7B 70F3 11A4 ED7C 49D9 87DA 4591" ENV GID=991 UID=991 -RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ - && echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ +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 \ diff --git a/rutorrent/Dockerfile b/rutorrent/Dockerfile index 7dd5bd8..7a8196a 100644 --- a/rutorrent/Dockerfile +++ b/rutorrent/Dockerfile @@ -13,8 +13,8 @@ ENV UID=991 \ WEBROOT=/ \ PKG_CONFIG_PATH=/usr/local/lib/pkgconfig -RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ - && echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ +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 \ @@ -49,8 +49,8 @@ RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/ap && wget -q http://downloads.sourceforge.net/mktorrent/mktorrent-1.0.tar.gz \ && tar xzvf mktorrent-1.0.tar.gz \ && svn checkout http://svn.code.sf.net/p/xmlrpc-c/code/stable xmlrpc-c \ - && git clone https://github.com/rakshasa/libtorrent.git \ - && git clone https://github.com/rakshasa/rtorrent.git \ + && git clone https://github.com/rakshasa/libtorrent.git --depth=1 \ + && git clone https://github.com/rakshasa/rtorrent.git --depth=1 \ && wget -q http://mediaarea.net/download/binary/mediainfo/${MEDIAINFO_VER}/MediaInfo_CLI_${MEDIAINFO_VER}_GNU_FromSource.tar.gz \ && wget -q http://mediaarea.net/download/binary/libmediainfo0/${MEDIAINFO_VER}/MediaInfo_DLL_${MEDIAINFO_VER}_GNU_FromSource.tar.gz \ && tar xzf MediaInfo_DLL_${MEDIAINFO_VER}_GNU_FromSource.tar.gz \ @@ -68,13 +68,13 @@ RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/ap && cd /tmp/rtorrent && git checkout ${RTORRENT_VER} && ./autogen.sh && ./configure --with-xmlrpc-c \ && make -j ${NB_CORES} && make install \ && mkdir -p /var/www && cd /var/www \ - && git clone https://github.com/Novik/ruTorrent.git rutorrent \ + && git clone https://github.com/Novik/ruTorrent.git rutorrent --depth=1 \ && cd /var/www/rutorrent/plugins/ \ - && git clone https://github.com/Korni22/rutorrent-logoff logoff \ - && git clone https://github.com/xombiemp/rutorrentMobile.git mobile \ - && git clone https://github.com/Ardakilic/rutorrent-pausewebui pausewebui \ + && git clone https://github.com/Korni22/rutorrent-logoff logoff --depth=1 \ + && git clone https://github.com/xombiemp/rutorrentMobile.git mobile --depth=1 \ + && git clone https://github.com/Ardakilic/rutorrent-pausewebui pausewebui --depth=1 \ && cd /var/www/rutorrent/plugins/theme/themes \ - && git clone https://github.com/Phlooo/ruTorrent-MaterialDesign.git Material \ + && git clone https://github.com/Phlooo/ruTorrent-MaterialDesign.git Material --depth=1 \ && mv /var/www/rutorrent /var/www/torrent \ && mkdir /filebot \ && wget -q http://downloads.sourceforge.net/project/filebot/filebot/FileBot_${FILEBOT_VER}/FileBot_${FILEBOT_VER}-portable.zip -P /tmp \ diff --git a/searx/Dockerfile b/searx/Dockerfile index 7497164..fe198be 100644 --- a/searx/Dockerfile +++ b/searx/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER Wonderfall ENV BASE_URL=False IMAGE_PROXY=False -RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ +RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ && BUILD_DEPS=" \ build-base \ python-dev \ diff --git a/subsonic/Dockerfile b/subsonic/Dockerfile index dc47e42..5b56920 100644 --- a/subsonic/Dockerfile +++ b/subsonic/Dockerfile @@ -5,7 +5,7 @@ ARG VERSION=6.0 ENV GID=991 UID=991 WORKDIR /subsonic -RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ +RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ && apk -U add \ ffmpeg \ openjdk8-jre@commuedge \ diff --git a/zerobin/Dockerfile b/zerobin/Dockerfile index 9045ec5..c768fb2 100644 --- a/zerobin/Dockerfile +++ b/zerobin/Dockerfile @@ -3,25 +3,23 @@ MAINTAINER Wonderfall ENV GID=991 UID=991 -RUN echo "@commuedge http://nl.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \ - && echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ +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 \ - libwebp \ + supervisor \ + tini@commuedge \ php7-fpm@testing \ php7-gd@testing \ php7-mcrypt@testing \ php7-json@testing \ php7-zlib@testing \ - supervisor \ - tini@commuedge \ - openssl \ - ca-certificates \ - tar \ && mkdir zerobin && cd zerobin \ && wget -qO- https://github.com/elrido/ZeroBin/archive/master.tar.gz | tar xz --strip 1 \ && mv cfg/conf.ini.sample cfg/conf.ini \ - && apk del tar openssl ca-certificates \ + && apk del $BUILD_DEPS \ && rm -f /var/cache/apk/* COPY nginx.conf /etc/nginx/nginx.conf @@ -32,6 +30,7 @@ COPY run.sh /usr/local/bin/run.sh RUN chmod +x /usr/local/bin/run.sh VOLUME /zerobin/data + EXPOSE 80 CMD ["/sbin/tini","--","run.sh"]