diff --git a/Dockerfile b/Dockerfile index 3ce4e26..683cf71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.13-php8 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14-php8 # set version label ARG BUILD_DATE @@ -8,105 +8,106 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="aptalca" # environment settings -ENV NEXTCLOUD_PATH="/config/www/nextcloud" \ +ENV \ + NEXTCLOUD_PATH="/config/www/nextcloud" \ LD_PRELOAD="/usr/lib/preloadable_libiconv.so" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies --upgrade \ - autoconf \ - automake \ - file \ - g++ \ - gcc \ - make \ - php8-dev \ - re2c \ - samba-dev \ - zlib-dev && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache --upgrade \ - curl \ - ffmpeg \ - gnu-libiconv \ - imagemagick \ - libxml2 \ - php8-bcmath \ - php8-bz2 \ - php8-ctype \ - php8-curl \ - php8-dom \ - php8-exif \ - php8-fileinfo \ - php8-ftp \ - php8-gd \ - php8-gmp \ - php8-iconv \ - php8-imap \ - php8-intl \ - php8-ldap \ - php8-opcache \ - php8-pcntl \ - php8-pdo_mysql \ - php8-pdo_pgsql \ - php8-pdo_sqlite \ - php8-pecl-apcu \ - php8-pecl-imagick \ - php8-pecl-mcrypt \ - php8-pecl-memcached \ - php8-pgsql \ - php8-phar \ - php8-posix \ - php8-redis \ - php8-sodium \ - php8-sqlite3 \ - php8-xmlreader \ - php8-zip \ - samba-client \ - sudo \ - tar \ - unzip && \ - echo "**** compile smbclient ****" && \ - git clone git://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \ - cd /tmp/smbclient && \ - phpize8 && \ - ./configure \ - --with-php-config=/usr/bin/php-config8 && \ - make && \ - make install && \ - echo "**** configure php and nginx for nextcloud ****" && \ - echo "extension="smbclient.so"" > /etc/php8/conf.d/00_smbclient.ini && \ - echo 'apc.enable_cli=1' >> /etc/php8/conf.d/apcu.ini && \ - sed -i \ - -e 's/;opcache.enable.*=.*/opcache.enable=1/g' \ - -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=8/g' \ - -e 's/;opcache.max_accelerated_files.*=.*/opcache.max_accelerated_files=10000/g' \ - -e 's/;opcache.memory_consumption.*=.*/opcache.memory_consumption=128/g' \ - -e 's/;opcache.save_comments.*=.*/opcache.save_comments=1/g' \ - -e 's/;opcache.revalidate_freq.*=.*/opcache.revalidate_freq=1/g' \ - -e 's/;always_populate_raw_post_data.*=.*/always_populate_raw_post_data=-1/g' \ - -e 's/memory_limit.*=.*128M/memory_limit=512M/g' \ - -e 's/max_execution_time.*=.*30/max_execution_time=120/g' \ - -e 's/upload_max_filesize.*=.*2M/upload_max_filesize=1024M/g' \ - -e 's/post_max_size.*=.*8M/post_max_size=1024M/g' \ - /etc/php8/php.ini && \ - sed -i \ - '/opcache.enable=1/a opcache.enable_cli=1' \ - /etc/php8/php.ini && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \ - echo "**** set version tag ****" && \ - if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \ - NEXTCLOUD_RELEASE=$(curl -s https://raw.githubusercontent.com/nextcloud/nextcloud.com/master/strings.php \ - | awk -F\' '/VERSIONS_SERVER_FULL_STABLE/ {print $2;exit}'); \ - fi && \ - echo "**** download nextcloud ****" && \ - curl -o /app/nextcloud.tar.bz2 -L \ - https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies --upgrade \ + autoconf \ + automake \ + file \ + g++ \ + gcc \ + make \ + php8-dev \ + re2c \ + samba-dev \ + zlib-dev && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache --upgrade \ + curl \ + ffmpeg \ + gnu-libiconv \ + imagemagick \ + libxml2 \ + php8-bcmath \ + php8-bz2 \ + php8-ctype \ + php8-curl \ + php8-dom \ + php8-exif \ + php8-fileinfo \ + php8-ftp \ + php8-gd \ + php8-gmp \ + php8-iconv \ + php8-imap \ + php8-intl \ + php8-ldap \ + php8-opcache \ + php8-pcntl \ + php8-pdo_mysql \ + php8-pdo_pgsql \ + php8-pdo_sqlite \ + php8-pecl-apcu \ + php8-pecl-imagick \ + php8-pecl-mcrypt \ + php8-pecl-memcached \ + php8-pgsql \ + php8-phar \ + php8-posix \ + php8-redis \ + php8-sodium \ + php8-sqlite3 \ + php8-xmlreader \ + php8-zip \ + samba-client \ + sudo \ + tar \ + unzip && \ + echo "**** compile smbclient ****" && \ + git clone git://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \ + cd /tmp/smbclient && \ + phpize8 && \ + ./configure \ + --with-php-config=/usr/bin/php-config8 && \ + make && \ + make install && \ + echo "**** configure php and nginx for nextcloud ****" && \ + echo "extension="smbclient.so"" > /etc/php8/conf.d/00_smbclient.ini && \ + echo 'apc.enable_cli=1' >> /etc/php8/conf.d/apcu.ini && \ + sed -i \ + -e 's/;opcache.enable.*=.*/opcache.enable=1/g' \ + -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=8/g' \ + -e 's/;opcache.max_accelerated_files.*=.*/opcache.max_accelerated_files=10000/g' \ + -e 's/;opcache.memory_consumption.*=.*/opcache.memory_consumption=128/g' \ + -e 's/;opcache.save_comments.*=.*/opcache.save_comments=1/g' \ + -e 's/;opcache.revalidate_freq.*=.*/opcache.revalidate_freq=1/g' \ + -e 's/;always_populate_raw_post_data.*=.*/always_populate_raw_post_data=-1/g' \ + -e 's/memory_limit.*=.*128M/memory_limit=512M/g' \ + -e 's/max_execution_time.*=.*30/max_execution_time=120/g' \ + -e 's/upload_max_filesize.*=.*2M/upload_max_filesize=1024M/g' \ + -e 's/post_max_size.*=.*8M/post_max_size=1024M/g' \ + /etc/php8/php.ini && \ + sed -i \ + '/opcache.enable=1/a opcache.enable_cli=1' \ + /etc/php8/php.ini && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \ + echo "**** set version tag ****" && \ + if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \ + NEXTCLOUD_RELEASE=$(curl -s https://raw.githubusercontent.com/nextcloud/nextcloud.com/master/strings.php \ + | awk -F\' '/VERSIONS_SERVER_FULL_STABLE/ {print $2;exit}'); \ + fi && \ + echo "**** download nextcloud ****" && \ + curl -o /app/nextcloud.tar.bz2 -L \ + https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /tmp/* # copy local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 9815035..830167a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.13-php8 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14-php8 # set version label ARG BUILD_DATE @@ -8,105 +8,106 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="aptalca" # environment settings -ENV NEXTCLOUD_PATH="/config/www/nextcloud" \ +ENV \ + NEXTCLOUD_PATH="/config/www/nextcloud" \ LD_PRELOAD="/usr/lib/preloadable_libiconv.so" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies --upgrade \ - autoconf \ - automake \ - file \ - g++ \ - gcc \ - make \ - php8-dev \ - re2c \ - samba-dev \ - zlib-dev && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache --upgrade \ - curl \ - ffmpeg \ - gnu-libiconv \ - imagemagick \ - libxml2 \ - php8-bcmath \ - php8-bz2 \ - php8-ctype \ - php8-curl \ - php8-dom \ - php8-exif \ - php8-fileinfo \ - php8-ftp \ - php8-gd \ - php8-gmp \ - php8-iconv \ - php8-imap \ - php8-intl \ - php8-ldap \ - php8-opcache \ - php8-pcntl \ - php8-pdo_mysql \ - php8-pdo_pgsql \ - php8-pdo_sqlite \ - php8-pecl-apcu \ - php8-pecl-imagick \ - php8-pecl-mcrypt \ - php8-pecl-memcached \ - php8-pgsql \ - php8-phar \ - php8-posix \ - php8-redis \ - php8-sodium \ - php8-sqlite3 \ - php8-xmlreader \ - php8-zip \ - samba-client \ - sudo \ - tar \ - unzip && \ - echo "**** compile smbclient ****" && \ - git clone git://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \ - cd /tmp/smbclient && \ - phpize8 && \ - ./configure \ - --with-php-config=/usr/bin/php-config8 && \ - make && \ - make install && \ - echo "**** configure php and nginx for nextcloud ****" && \ - echo "extension="smbclient.so"" > /etc/php8/conf.d/00_smbclient.ini && \ - echo 'apc.enable_cli=1' >> /etc/php8/conf.d/apcu.ini && \ - sed -i \ - -e 's/;opcache.enable.*=.*/opcache.enable=1/g' \ - -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=8/g' \ - -e 's/;opcache.max_accelerated_files.*=.*/opcache.max_accelerated_files=10000/g' \ - -e 's/;opcache.memory_consumption.*=.*/opcache.memory_consumption=128/g' \ - -e 's/;opcache.save_comments.*=.*/opcache.save_comments=1/g' \ - -e 's/;opcache.revalidate_freq.*=.*/opcache.revalidate_freq=1/g' \ - -e 's/;always_populate_raw_post_data.*=.*/always_populate_raw_post_data=-1/g' \ - -e 's/memory_limit.*=.*128M/memory_limit=512M/g' \ - -e 's/max_execution_time.*=.*30/max_execution_time=120/g' \ - -e 's/upload_max_filesize.*=.*2M/upload_max_filesize=1024M/g' \ - -e 's/post_max_size.*=.*8M/post_max_size=1024M/g' \ - /etc/php8/php.ini && \ - sed -i \ - '/opcache.enable=1/a opcache.enable_cli=1' \ - /etc/php8/php.ini && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \ - echo "**** set version tag ****" && \ - if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \ - NEXTCLOUD_RELEASE=$(curl -s https://raw.githubusercontent.com/nextcloud/nextcloud.com/master/strings.php \ - | awk -F\' '/VERSIONS_SERVER_FULL_STABLE/ {print $2;exit}'); \ - fi && \ - echo "**** download nextcloud ****" && \ - curl -o /app/nextcloud.tar.bz2 -L \ - https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies --upgrade \ + autoconf \ + automake \ + file \ + g++ \ + gcc \ + make \ + php8-dev \ + re2c \ + samba-dev \ + zlib-dev && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache --upgrade \ + curl \ + ffmpeg \ + gnu-libiconv \ + imagemagick \ + libxml2 \ + php8-bcmath \ + php8-bz2 \ + php8-ctype \ + php8-curl \ + php8-dom \ + php8-exif \ + php8-fileinfo \ + php8-ftp \ + php8-gd \ + php8-gmp \ + php8-iconv \ + php8-imap \ + php8-intl \ + php8-ldap \ + php8-opcache \ + php8-pcntl \ + php8-pdo_mysql \ + php8-pdo_pgsql \ + php8-pdo_sqlite \ + php8-pecl-apcu \ + php8-pecl-imagick \ + php8-pecl-mcrypt \ + php8-pecl-memcached \ + php8-pgsql \ + php8-phar \ + php8-posix \ + php8-redis \ + php8-sodium \ + php8-sqlite3 \ + php8-xmlreader \ + php8-zip \ + samba-client \ + sudo \ + tar \ + unzip && \ + echo "**** compile smbclient ****" && \ + git clone git://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \ + cd /tmp/smbclient && \ + phpize8 && \ + ./configure \ + --with-php-config=/usr/bin/php-config8 && \ + make && \ + make install && \ + echo "**** configure php and nginx for nextcloud ****" && \ + echo "extension="smbclient.so"" > /etc/php8/conf.d/00_smbclient.ini && \ + echo 'apc.enable_cli=1' >> /etc/php8/conf.d/apcu.ini && \ + sed -i \ + -e 's/;opcache.enable.*=.*/opcache.enable=1/g' \ + -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=8/g' \ + -e 's/;opcache.max_accelerated_files.*=.*/opcache.max_accelerated_files=10000/g' \ + -e 's/;opcache.memory_consumption.*=.*/opcache.memory_consumption=128/g' \ + -e 's/;opcache.save_comments.*=.*/opcache.save_comments=1/g' \ + -e 's/;opcache.revalidate_freq.*=.*/opcache.revalidate_freq=1/g' \ + -e 's/;always_populate_raw_post_data.*=.*/always_populate_raw_post_data=-1/g' \ + -e 's/memory_limit.*=.*128M/memory_limit=512M/g' \ + -e 's/max_execution_time.*=.*30/max_execution_time=120/g' \ + -e 's/upload_max_filesize.*=.*2M/upload_max_filesize=1024M/g' \ + -e 's/post_max_size.*=.*8M/post_max_size=1024M/g' \ + /etc/php8/php.ini && \ + sed -i \ + '/opcache.enable=1/a opcache.enable_cli=1' \ + /etc/php8/php.ini && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \ + echo "**** set version tag ****" && \ + if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \ + NEXTCLOUD_RELEASE=$(curl -s https://raw.githubusercontent.com/nextcloud/nextcloud.com/master/strings.php \ + | awk -F\' '/VERSIONS_SERVER_FULL_STABLE/ {print $2;exit}'); \ + fi && \ + echo "**** download nextcloud ****" && \ + curl -o /app/nextcloud.tar.bz2 -L \ + https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /tmp/* # copy local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a3e4756..d5936a1 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.13-php8 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14-php8 # set version label ARG BUILD_DATE @@ -8,105 +8,106 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="aptalca" # environment settings -ENV NEXTCLOUD_PATH="/config/www/nextcloud" \ +ENV \ + NEXTCLOUD_PATH="/config/www/nextcloud" \ LD_PRELOAD="/usr/lib/preloadable_libiconv.so" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies --upgrade \ - autoconf \ - automake \ - file \ - g++ \ - gcc \ - make \ - php8-dev \ - re2c \ - samba-dev \ - zlib-dev && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache --upgrade \ - curl \ - ffmpeg \ - gnu-libiconv \ - imagemagick \ - libxml2 \ - php8-bcmath \ - php8-bz2 \ - php8-ctype \ - php8-curl \ - php8-dom \ - php8-exif \ - php8-fileinfo \ - php8-ftp \ - php8-gd \ - php8-gmp \ - php8-iconv \ - php8-imap \ - php8-intl \ - php8-ldap \ - php8-opcache \ - php8-pcntl \ - php8-pdo_mysql \ - php8-pdo_pgsql \ - php8-pdo_sqlite \ - php8-pecl-apcu \ - php8-pecl-imagick \ - php8-pecl-mcrypt \ - php8-pecl-memcached \ - php8-pgsql \ - php8-phar \ - php8-posix \ - php8-redis \ - php8-sodium \ - php8-sqlite3 \ - php8-xmlreader \ - php8-zip \ - samba-client \ - sudo \ - tar \ - unzip && \ - echo "**** compile smbclient ****" && \ - git clone git://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \ - cd /tmp/smbclient && \ - phpize8 && \ - ./configure \ - --with-php-config=/usr/bin/php-config8 && \ - make && \ - make install && \ - echo "**** configure php and nginx for nextcloud ****" && \ - echo "extension="smbclient.so"" > /etc/php8/conf.d/00_smbclient.ini && \ - echo 'apc.enable_cli=1' >> /etc/php8/conf.d/apcu.ini && \ - sed -i \ - -e 's/;opcache.enable.*=.*/opcache.enable=1/g' \ - -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=8/g' \ - -e 's/;opcache.max_accelerated_files.*=.*/opcache.max_accelerated_files=10000/g' \ - -e 's/;opcache.memory_consumption.*=.*/opcache.memory_consumption=128/g' \ - -e 's/;opcache.save_comments.*=.*/opcache.save_comments=1/g' \ - -e 's/;opcache.revalidate_freq.*=.*/opcache.revalidate_freq=1/g' \ - -e 's/;always_populate_raw_post_data.*=.*/always_populate_raw_post_data=-1/g' \ - -e 's/memory_limit.*=.*128M/memory_limit=512M/g' \ - -e 's/max_execution_time.*=.*30/max_execution_time=120/g' \ - -e 's/upload_max_filesize.*=.*2M/upload_max_filesize=1024M/g' \ - -e 's/post_max_size.*=.*8M/post_max_size=1024M/g' \ - /etc/php8/php.ini && \ - sed -i \ - '/opcache.enable=1/a opcache.enable_cli=1' \ - /etc/php8/php.ini && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \ - echo "**** set version tag ****" && \ - if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \ - NEXTCLOUD_RELEASE=$(curl -s https://raw.githubusercontent.com/nextcloud/nextcloud.com/master/strings.php \ - | awk -F\' '/VERSIONS_SERVER_FULL_STABLE/ {print $2;exit}'); \ - fi && \ - echo "**** download nextcloud ****" && \ - curl -o /app/nextcloud.tar.bz2 -L \ - https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies --upgrade \ + autoconf \ + automake \ + file \ + g++ \ + gcc \ + make \ + php8-dev \ + re2c \ + samba-dev \ + zlib-dev && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache --upgrade \ + curl \ + ffmpeg \ + gnu-libiconv \ + imagemagick \ + libxml2 \ + php8-bcmath \ + php8-bz2 \ + php8-ctype \ + php8-curl \ + php8-dom \ + php8-exif \ + php8-fileinfo \ + php8-ftp \ + php8-gd \ + php8-gmp \ + php8-iconv \ + php8-imap \ + php8-intl \ + php8-ldap \ + php8-opcache \ + php8-pcntl \ + php8-pdo_mysql \ + php8-pdo_pgsql \ + php8-pdo_sqlite \ + php8-pecl-apcu \ + php8-pecl-imagick \ + php8-pecl-mcrypt \ + php8-pecl-memcached \ + php8-pgsql \ + php8-phar \ + php8-posix \ + php8-redis \ + php8-sodium \ + php8-sqlite3 \ + php8-xmlreader \ + php8-zip \ + samba-client \ + sudo \ + tar \ + unzip && \ + echo "**** compile smbclient ****" && \ + git clone git://github.com/eduardok/libsmbclient-php.git /tmp/smbclient && \ + cd /tmp/smbclient && \ + phpize8 && \ + ./configure \ + --with-php-config=/usr/bin/php-config8 && \ + make && \ + make install && \ + echo "**** configure php and nginx for nextcloud ****" && \ + echo "extension="smbclient.so"" > /etc/php8/conf.d/00_smbclient.ini && \ + echo 'apc.enable_cli=1' >> /etc/php8/conf.d/apcu.ini && \ + sed -i \ + -e 's/;opcache.enable.*=.*/opcache.enable=1/g' \ + -e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=8/g' \ + -e 's/;opcache.max_accelerated_files.*=.*/opcache.max_accelerated_files=10000/g' \ + -e 's/;opcache.memory_consumption.*=.*/opcache.memory_consumption=128/g' \ + -e 's/;opcache.save_comments.*=.*/opcache.save_comments=1/g' \ + -e 's/;opcache.revalidate_freq.*=.*/opcache.revalidate_freq=1/g' \ + -e 's/;always_populate_raw_post_data.*=.*/always_populate_raw_post_data=-1/g' \ + -e 's/memory_limit.*=.*128M/memory_limit=512M/g' \ + -e 's/max_execution_time.*=.*30/max_execution_time=120/g' \ + -e 's/upload_max_filesize.*=.*2M/upload_max_filesize=1024M/g' \ + -e 's/post_max_size.*=.*8M/post_max_size=1024M/g' \ + /etc/php8/php.ini && \ + sed -i \ + '/opcache.enable=1/a opcache.enable_cli=1' \ + /etc/php8/php.ini && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8/php-fpm.conf && \ + echo "**** set version tag ****" && \ + if [ -z ${NEXTCLOUD_RELEASE+x} ]; then \ + NEXTCLOUD_RELEASE=$(curl -s https://raw.githubusercontent.com/nextcloud/nextcloud.com/master/strings.php \ + | awk -F\' '/VERSIONS_SERVER_FULL_STABLE/ {print $2;exit}'); \ + fi && \ + echo "**** download nextcloud ****" && \ + curl -o /app/nextcloud.tar.bz2 -L \ + https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_RELEASE}.tar.bz2 && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /tmp/* # copy local files COPY root/ / diff --git a/README.md b/README.md index e975b1c..665deb3 100644 --- a/README.md +++ b/README.md @@ -249,6 +249,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **24.06.21:** - Rebase to alpine 3.14. * **01.04.21:** - Fix crontab during upgrade from php7. * **16.03.21:** - Rebase on the php8 nginx baseimage. * **25.02.21:** - Nginx default site config updated for v21 (existing users should delete `/config/nginx/site-confs/default` and restart the container). diff --git a/readme-vars.yml b/readme-vars.yml index 8651d12..a40cff5 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -75,6 +75,7 @@ app_setup_block: | # changelog changelogs: + - { date: "24.06.21:", desc: "Rebase to alpine 3.14." } - { date: "01.04.21:", desc: "Fix crontab during upgrade from php7." } - { date: "16.03.21:", desc: "Rebase on the php8 nginx baseimage." } - { date: "25.02.21:", desc: "Nginx default site config updated for v21 (existing users should delete `/config/nginx/site-confs/default` and restart the container)." } diff --git a/root/defaults/nextcloud-perms.sh b/root/defaults/nextcloud-perms.sh index 2ba8ba6..0e9c103 100644 --- a/root/defaults/nextcloud-perms.sh +++ b/root/defaults/nextcloud-perms.sh @@ -26,13 +26,11 @@ chown -R ${htuser}:${htgroup} ${ocpath}/updater/ chmod +x ${ocpath}/occ printf "chmod/chown .htaccess\n" -if [ -f ${ocpath}/.htaccess ] - then - chmod 0644 ${ocpath}/.htaccess - chown ${rootuser}:${htgroup} ${ocpath}/.htaccess +if [ -f ${ocpath}/.htaccess ]; then + chmod 0644 ${ocpath}/.htaccess + chown ${rootuser}:${htgroup} ${ocpath}/.htaccess fi -if [ -f ${ocpath}/data/.htaccess ] - then - chmod 0644 ${ocpath}/data/.htaccess - chown ${rootuser}:${htgroup} ${ocpath}/data/.htaccess +if [ -f ${ocpath}/data/.htaccess ]; then + chmod 0644 ${ocpath}/data/.htaccess + chown ${rootuser}:${htgroup} ${ocpath}/data/.htaccess fi diff --git a/root/etc/cont-init.d/40-config b/root/etc/cont-init.d/40-config index 4deb6b2..7a24565 100644 --- a/root/etc/cont-init.d/40-config +++ b/root/etc/cont-init.d/40-config @@ -2,7 +2,7 @@ # permissions chown abc:abc \ - /config \ - /data + /config \ + /data chown -R abc:abc \ - /var/lib/nginx + /var/lib/nginx diff --git a/root/etc/cont-init.d/50-install b/root/etc/cont-init.d/50-install index 2e41030..f4443c2 100644 --- a/root/etc/cont-init.d/50-install +++ b/root/etc/cont-init.d/50-install @@ -2,20 +2,20 @@ # create folders mkdir -p \ - "${NEXTCLOUD_PATH}" \ - /config/crontabs + "${NEXTCLOUD_PATH}" \ + /config/crontabs # install app if [ ! -e "${NEXTCLOUD_PATH}/index.php" ]; then - tar xf /app/nextcloud.tar.bz2 -C \ - "${NEXTCLOUD_PATH}" --strip-components=1 - chown abc:abc -R \ - "${NEXTCLOUD_PATH}" - chmod +x "${NEXTCLOUD_PATH}/occ" + tar xf /app/nextcloud.tar.bz2 -C \ + "${NEXTCLOUD_PATH}" --strip-components=1 + chown abc:abc -R \ + "${NEXTCLOUD_PATH}" + chmod +x "${NEXTCLOUD_PATH}/occ" fi # set cronjob [[ ! -f /config/crontabs/root ]] && \ - cp /defaults/root /config/crontabs/root + cp /defaults/root /config/crontabs/root sed -i 's|php7|php8|g' /config/crontabs/root cp /config/crontabs/root /etc/crontabs/root diff --git a/root/etc/cont-init.d/60-memcache b/root/etc/cont-init.d/60-memcache index 10697d7..c64558f 100644 --- a/root/etc/cont-init.d/60-memcache +++ b/root/etc/cont-init.d/60-memcache @@ -2,8 +2,8 @@ # copy config [[ ! -f /config/www/nextcloud/config/config.php ]] && \ - cp /defaults/config.php /config/www/nextcloud/config/config.php + cp /defaults/config.php /config/www/nextcloud/config/config.php # permissions chown abc:abc \ - /config/www/nextcloud/config/config.php + /config/www/nextcloud/config/config.php diff --git a/root/etc/cont-init.d/70-aliases b/root/etc/cont-init.d/70-aliases index 4257ae2..9326659 100644 --- a/root/etc/cont-init.d/70-aliases +++ b/root/etc/cont-init.d/70-aliases @@ -2,19 +2,19 @@ ## Set alias for occ and make executable [[ ! -f /usr/bin/occ ]] && \ - echo -e '#!/bin/bash\nsudo -u abc -s /bin/bash -c "php8 /config/www/nextcloud/occ $*"' > /usr/bin/occ + echo -e '#!/bin/bash\nsudo -u abc -s /bin/bash -c "php8 /config/www/nextcloud/occ $*"' > /usr/bin/occ [[ ! -x /usr/bin/occ ]] && \ - chmod +x /usr/bin/occ + chmod +x /usr/bin/occ ## Set alias for updater.phar and make executable [[ ! -f /usr/bin/updater.phar ]] && \ - echo -e '#!/bin/bash\nsudo -u abc -s /bin/bash -c "php8 /config/www/nextcloud/updater/updater.phar $*"' > /usr/bin/updater.phar + echo -e '#!/bin/bash\nsudo -u abc -s /bin/bash -c "php8 /config/www/nextcloud/updater/updater.phar $*"' > /usr/bin/updater.phar [[ ! -x /usr/bin/updater.phar ]] && \ - chmod +x /usr/bin/updater.phar + chmod +x /usr/bin/updater.phar if ( occ app:list --no-interaction | grep -q richdocumentscode) 2>/dev/null; then - echo "Removing CODE Server" - occ app:remove --no-interaction richdocumentscode 2>/dev/null + echo "Removing CODE Server" + occ app:remove --no-interaction richdocumentscode 2>/dev/null fi diff --git a/root/etc/services.d/cron/run b/root/etc/services.d/cron/run index a1b27f4..6cfaef5 100644 --- a/root/etc/services.d/cron/run +++ b/root/etc/services.d/cron/run @@ -1,3 +1,3 @@ #!/usr/bin/with-contenv bash -/usr/sbin/crond -f -S -l 0 -c /etc/crontabs +exec /usr/sbin/crond -f -S -l 0 -c /etc/crontabs