From 77a17e220e48462f47cf0247dda1396f5b38129b Mon Sep 17 00:00:00 2001 From: Wonderfall Date: Wed, 12 Oct 2016 10:27:01 +0200 Subject: [PATCH] nextcloud: remove 9.0 --- nextcloud/9.0/Dockerfile | 108 ------------------------- nextcloud/9.0/apcu.ini | 4 - nextcloud/9.0/nginx.conf | 113 --------------------------- nextcloud/9.0/occ | 2 - nextcloud/9.0/opcache.ini | 8 -- nextcloud/9.0/php-fpm.conf | 18 ----- nextcloud/9.0/run.sh | 17 ---- nextcloud/9.0/s6.d/.s6-svscan/finish | 3 - nextcloud/9.0/s6.d/cron/run | 6 -- nextcloud/9.0/s6.d/nginx/run | 2 - nextcloud/9.0/s6.d/php/run | 2 - 11 files changed, 283 deletions(-) delete mode 100644 nextcloud/9.0/Dockerfile delete mode 100644 nextcloud/9.0/apcu.ini delete mode 100644 nextcloud/9.0/nginx.conf delete mode 100644 nextcloud/9.0/occ delete mode 100644 nextcloud/9.0/opcache.ini delete mode 100644 nextcloud/9.0/php-fpm.conf delete mode 100644 nextcloud/9.0/run.sh delete mode 100644 nextcloud/9.0/s6.d/.s6-svscan/finish delete mode 100644 nextcloud/9.0/s6.d/cron/run delete mode 100644 nextcloud/9.0/s6.d/nginx/run delete mode 100644 nextcloud/9.0/s6.d/php/run diff --git a/nextcloud/9.0/Dockerfile b/nextcloud/9.0/Dockerfile deleted file mode 100644 index c80c4b4..0000000 --- a/nextcloud/9.0/Dockerfile +++ /dev/null @@ -1,108 +0,0 @@ -FROM alpine:3.4 -MAINTAINER Wonderfall - -ARG NEXTCLOUD_VERSION=9.0.54 -ARG GNU_LIBICONV_VERSION=1.14 -ARG GPG_nextcloud="2880 6A87 8AE4 23A2 8372 792E D758 99B9 A724 937A" - -ENV UID=991 GID=991 \ - UPLOAD_MAX_SIZE=10G \ - APC_SHM_SIZE=128M \ - OPCACHE_MEM_SIZE=128 \ - CRON_PERIOD=15m - -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 \ - build-base \ - autoconf \ - automake \ - libtool" \ - && apk -U add \ - ${BUILD_DEPS} \ - nginx \ - s6 \ - openssl \ - ca-certificates \ - libsmbclient \ - samba-client \ - su-exec \ - php7@commuedge \ - php7-fpm@commuedge \ - php7-intl@commuedge \ - php7-mbstring@commuedge \ - php7-curl@commuedge \ - php7-gd@commuedge \ - php7-mcrypt@commuedge \ - php7-opcache@commuedge \ - php7-json@commuedge \ - php7-session@commuedge \ - php7-pdo@commuedge \ - php7-dom@commuedge \ - php7-ctype@commuedge \ - php7-pdo_mysql@commuedge \ - php7-pdo_pgsql@commuedge \ - php7-pgsql@commuedge \ - php7-pdo_sqlite@commuedge \ - php7-sqlite3@commuedge \ - php7-zlib@commuedge \ - php7-zip@commuedge \ - php7-xmlreader@commuedge \ - php7-posix@commuedge \ - php7-openssl@commuedge \ - php7-ldap@commuedge \ - php7-ftp@commuedge \ - php7-apcu@testing \ - php7-redis@testing \ - php7-pear@commuedge \ - php7-dev@commuedge \ - && mkdir /nextcloud && 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 \ - && wget -q https://raw.githubusercontent.com/mxe/mxe/7e231efd245996b886b501dad780761205ecf376/src/libiconv-1-fixes.patch \ - && patch -p1 -u < libiconv-1-fixes.patch \ - && make && make install && libtool --finish /usr/local/lib && cd /tmp \ - && wget -q http://is1.php.net/get/php-7.0.11.tar.gz/from/this/mirror -O php7.tar.gz \ - && tar xzf php7.tar.gz && cd /tmp/php-7.0.11/ext/iconv && phpize7 \ - && ./configure --with-iconv=/usr/local --with-php-config=/usr/bin/php-config7 \ - && make && cp modules/iconv.so /usr/lib/php7/modules && cd /tmp \ - && echo "extension=iconv.so" > /etc/php7/conf.d/00_iconv.ini \ - && NEXTCLOUD_TARBALL="nextcloud-${NEXTCLOUD_VERSION}.tar.bz2" \ - && wget -q https://download.nextcloud.com/server/releases/${NEXTCLOUD_TARBALL} \ - && wget -q https://download.nextcloud.com/server/releases/${NEXTCLOUD_TARBALL}.sha256 \ - && wget -q https://download.nextcloud.com/server/releases/${NEXTCLOUD_TARBALL}.asc \ - && wget -q https://nextcloud.com/nextcloud.asc \ - && echo "Verifying both integrity and authenticity of ${NEXTCLOUD_TARBALL}..." \ - && CHECKSUM_STATE=$(echo -n $(sha256sum -c ${NEXTCLOUD_TARBALL}.sha256) | tail -c 2) \ - && if [ "${CHECKSUM_STATE}" != "OK" ]; then echo "Warning! Checksum does not match!" && exit 1; fi \ - && gpg --import nextcloud.asc \ - && FINGERPRINT="$(LANG=C gpg --verify ${NEXTCLOUD_TARBALL}.asc ${NEXTCLOUD_TARBALL} 2>&1 \ - | sed -n "s#Primary key fingerprint: \(.*\)#\1#p")" \ - && if [ -z "${FINGERPRINT}" ]; then echo "Warning! Invalid GPG signature!" && exit 1; fi \ - && if [ "${FINGERPRINT}" != "${GPG_nextcloud}" ]; then echo "Warning! Wrong GPG fingerprint!" && exit 1; fi \ - && echo "All seems good, now unpacking ${NEXTCLOUD_TARBALL}..." \ - && tar xjf ${NEXTCLOUD_TARBALL} --strip 1 -C /nextcloud \ - && apk del ${BUILD_DEPS} php7-pear php7-dev \ - && rm -rf /var/cache/apk/* /tmp/* /root/.gnupg - -COPY nginx.conf /etc/nginx/nginx.conf -COPY php-fpm.conf /etc/php7/php-fpm.conf -COPY opcache.ini /etc/php7/conf.d/00_opcache.ini -COPY apcu.ini /etc/php7/conf.d/apcu.ini -COPY run.sh /usr/local/bin/run.sh -COPY occ /usr/local/bin/occ -COPY s6.d /etc/s6.d - -RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/* - -VOLUME /data /config /apps2 - -EXPOSE 8888 - -LABEL description="A server software for creating file hosting services" \ - nextcloud="Nextcloud v${NEXTCLOUD_VERSION}" - -CMD ["run.sh"] diff --git a/nextcloud/9.0/apcu.ini b/nextcloud/9.0/apcu.ini deleted file mode 100644 index 1bf9b49..0000000 --- a/nextcloud/9.0/apcu.ini +++ /dev/null @@ -1,4 +0,0 @@ -extension=apcu.so -apc.enabled=1 -apc.shm_size= -apc.ttl=7200 diff --git a/nextcloud/9.0/nginx.conf b/nextcloud/9.0/nginx.conf deleted file mode 100644 index 0633855..0000000 --- a/nextcloud/9.0/nginx.conf +++ /dev/null @@ -1,113 +0,0 @@ -worker_processes auto; -pid /tmp/nginx.pid; -daemon off; - -events { - worker_connections 1024; - use epoll; -} - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - access_log off; - error_log /tmp/ngx_error.log error; - - sendfile on; - keepalive_timeout 15; - keepalive_disable msie6; - keepalive_requests 100; - tcp_nopush on; - tcp_nodelay on; - server_tokens off; - - fastcgi_temp_path /tmp/fastcgi 1 2; - client_body_temp_path /tmp/client_body 1 2; - proxy_temp_path /tmp/proxy 1 2; - uwsgi_temp_path /tmp/uwsgi 1 2; - scgi_temp_path /tmp/scgi 1 2; - - gzip off; - - server { - listen 8888; - root /nextcloud; - - client_max_body_size ; - fastcgi_buffers 64 4K; - - error_page 403 /core/templates/403.php; - error_page 404 /core/templates/404.php; - - add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload"; - add_header X-Frame-Options "SAMEORIGIN"; - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; - add_header X-Download-Options noopen; - add_header X-Permitted-Cross-Domain-Policies none; - - location = /robots.txt { - allow all; - log_not_found off; - access_log off; - } - - location = /.well-known/carddav { - return 301 $scheme://$host/remote.php/dav; - } - - location = /.well-known/caldav { - return 301 $scheme://$host/remote.php/dav; - } - - location / { - rewrite ^ /index.php$uri; - } - - location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ { - deny all; - } - - location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) { - deny all; - } - - location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|core/templates/40[34])\.php(?:$|/) { - include fastcgi_params; - fastcgi_split_path_info ^(.+\.php)(/.*)$; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param modHeadersAvailable true; - fastcgi_param front_controller_active true; - fastcgi_pass unix:/tmp/php-fpm.sock; - fastcgi_intercept_errors on; - fastcgi_request_buffering off; - fastcgi_read_timeout 1200; - } - - location ~ ^/(?:updater|ocs-provider)(?:$|/) { - try_files $uri/ =404; - index index.php; - } - - location ~* \.(?:css|js)$ { - try_files $uri /index.php$uri$is_args$args; - add_header Cache-Control "public, max-age=7200"; - add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;"; - add_header X-Frame-Options "SAMEORIGIN"; - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; - add_header X-Download-Options noopen; - add_header X-Permitted-Cross-Domain-Policies none; - access_log off; - } - - location ~* \.(?:svg|gif|png|html|ttf|woff|ico|jpg|jpeg)$ { - try_files $uri /index.php$uri$is_args$args; - access_log off; - } - } -} diff --git a/nextcloud/9.0/occ b/nextcloud/9.0/occ deleted file mode 100644 index a766ef6..0000000 --- a/nextcloud/9.0/occ +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -su-exec $UID:$GID php7 /nextcloud/occ $@ diff --git a/nextcloud/9.0/opcache.ini b/nextcloud/9.0/opcache.ini deleted file mode 100644 index 705e399..0000000 --- a/nextcloud/9.0/opcache.ini +++ /dev/null @@ -1,8 +0,0 @@ -zend_extension=opcache.so -opcache.enable=1 -opcache.enable_cli=1 -opcache.fast_shutdown=1 -opcache.memory_consumption= -opcache.interned_strings_buffer=16 -opcache.max_accelerated_files=5413 -opcache.revalidate_freq=60 diff --git a/nextcloud/9.0/php-fpm.conf b/nextcloud/9.0/php-fpm.conf deleted file mode 100644 index 2bb8380..0000000 --- a/nextcloud/9.0/php-fpm.conf +++ /dev/null @@ -1,18 +0,0 @@ -[global] -daemonize = no - -[www] -listen = /tmp/php-fpm.sock -pm = dynamic -pm.max_children = 15 -pm.start_servers = 2 -pm.min_spare_servers = 1 -pm.max_spare_servers = 6 -chdir = / -request_terminate_timeout = 0 -env[PATH] = /usr/local/bin:/usr/bin:/bin -php_admin_value[post_max_size] = -php_admin_value[upload_max_filesize] = -php_admin_value[max_execution_time] = 10800 -php_admin_value[max_input_time] = 3600 -php_admin_value[expose_php] = Off diff --git a/nextcloud/9.0/run.sh b/nextcloud/9.0/run.sh deleted file mode 100644 index 3fdff29..0000000 --- a/nextcloud/9.0/run.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -if [ ! -f /config/config.php ]; then - echo -e " '/data',\n);" > /config/config.php -fi - -sed -i -e "s//$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf /etc/php7/php-fpm.conf \ - -e "s//$APC_SHM_SIZE/g" /etc/php7/conf.d/apcu.ini \ - -e "s//$OPCACHE_MEM_SIZE/g" /etc/php7/conf.d/00_opcache.ini \ - -e "s//$CRON_PERIOD/g" /etc/s6.d/cron/run - -chown -R $UID:$GID /nextcloud /data /config /apps2 /etc/nginx /etc/php7 /var/log /var/lib/nginx /tmp /etc/s6.d - -ln -s /config/config.php /nextcloud/config/config.php &>/dev/null -ln -s /apps2 /nextcloud &>/dev/null - -exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d diff --git a/nextcloud/9.0/s6.d/.s6-svscan/finish b/nextcloud/9.0/s6.d/.s6-svscan/finish deleted file mode 100644 index c52d3c2..0000000 --- a/nextcloud/9.0/s6.d/.s6-svscan/finish +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exit 0 diff --git a/nextcloud/9.0/s6.d/cron/run b/nextcloud/9.0/s6.d/cron/run deleted file mode 100644 index 2e6fec5..0000000 --- a/nextcloud/9.0/s6.d/cron/run +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -while true; do - php7 -f /nextcloud/cron.php - sleep -done diff --git a/nextcloud/9.0/s6.d/nginx/run b/nextcloud/9.0/s6.d/nginx/run deleted file mode 100644 index eaf8049..0000000 --- a/nextcloud/9.0/s6.d/nginx/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec nginx diff --git a/nextcloud/9.0/s6.d/php/run b/nextcloud/9.0/s6.d/php/run deleted file mode 100644 index e238021..0000000 --- a/nextcloud/9.0/s6.d/php/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec php-fpm7