diff --git a/Dockerfile b/Dockerfile index cecc2e3..67c9c8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15 # set version label ARG BUILD_DATE @@ -11,35 +11,37 @@ RUN \ echo "**** install runtime packages ****" && \ apk add -U --upgrade --no-cache \ curl \ - php7-bcmath \ - php7-bz2 \ - php7-cli \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-fileinfo \ - php7-gd \ - php7-gettext \ - php7-gmp \ - php7-json \ - php7-iconv \ - php7-mbstring \ - php7-mcrypt \ - php7-mysqli \ - php7-openssl \ - php7-pdo \ - php7-pdo_dblib \ - php7-pdo_mysql \ - php7-pecl-apcu \ - php7-pecl-memcached \ - php7-phar \ - php7-soap \ - php7-xmlreader \ - php7-xmlrpc \ - php7-zip \ + php8-bcmath \ + php8-bz2 \ + php8-cli \ + php8-ctype \ + php8-curl \ + php8-dom \ + php8-fileinfo \ + php8-gd \ + php8-gettext \ + php8-gmp \ + php8-iconv \ + php8-json \ + php8-mbstring \ + php8-mysqli \ + php8-openssl \ + php8-pdo \ + php8-pdo_dblib \ + php8-pdo_mysql \ + php8-pecl-apcu \ + php8-pecl-mcrypt \ + php8-pecl-memcached \ + php8-phar \ + php8-soap \ + php8-xmlreader \ + php8-zip \ unzip && \ + apk add --no-cache \ + --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \ + php8-pecl-xmlrpc && \ echo "**** install projectsend ****" && \ - mkdir -p /app/projectsend && \ + mkdir -p /app/www/public && \ if [ -z ${PROJECTSEND_VERSION+x} ]; then \ PROJECTSEND_VERSION=$(curl -sX GET "https://api.github.com/repos/projectsend/projectsend/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ @@ -49,16 +51,16 @@ RUN \ "https://github.com/projectsend/projectsend/releases/download/${PROJECTSEND_VERSION}/projectsend-${PROJECTSEND_VERSION}.zip" && \ unzip \ /tmp/projectsend.zip -d \ - /app/projectsend && \ - mv /app/projectsend/upload /defaults/ && \ - mv /app/projectsend /app/projectsend-tmp && \ + /app/www/public && \ + mv /app/www/public/upload /defaults/ && \ + mv /app/www/public /app/www/public-tmp && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* -# add local files +# copy local files COPY root/ / -# ports and volumes -EXPOSE 80 -VOLUME /config /data +# ports and volumes +EXPOSE 80 443 +VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index b8cd95e..46cdd5c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15 # set version label ARG BUILD_DATE @@ -11,35 +11,37 @@ RUN \ echo "**** install runtime packages ****" && \ apk add -U --upgrade --no-cache \ curl \ - php7-bcmath \ - php7-bz2 \ - php7-cli \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-fileinfo \ - php7-gd \ - php7-gettext \ - php7-gmp \ - php7-json \ - php7-iconv \ - php7-mbstring \ - php7-mcrypt \ - php7-mysqli \ - php7-openssl \ - php7-pdo \ - php7-pdo_dblib \ - php7-pdo_mysql \ - php7-pecl-apcu \ - php7-pecl-memcached \ - php7-phar \ - php7-soap \ - php7-xmlreader \ - php7-xmlrpc \ - php7-zip \ + php8-bcmath \ + php8-bz2 \ + php8-cli \ + php8-ctype \ + php8-curl \ + php8-dom \ + php8-fileinfo \ + php8-gd \ + php8-gettext \ + php8-gmp \ + php8-iconv \ + php8-json \ + php8-mbstring \ + php8-mysqli \ + php8-openssl \ + php8-pdo \ + php8-pdo_dblib \ + php8-pdo_mysql \ + php8-pecl-apcu \ + php8-pecl-mcrypt \ + php8-pecl-memcached \ + php8-phar \ + php8-soap \ + php8-xmlreader \ + php8-zip \ unzip && \ + apk add --no-cache \ + --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \ + php8-pecl-xmlrpc && \ echo "**** install projectsend ****" && \ - mkdir -p /app/projectsend && \ + mkdir -p /app/www/public && \ if [ -z ${PROJECTSEND_VERSION+x} ]; then \ PROJECTSEND_VERSION=$(curl -sX GET "https://api.github.com/repos/projectsend/projectsend/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ @@ -49,16 +51,16 @@ RUN \ "https://github.com/projectsend/projectsend/releases/download/${PROJECTSEND_VERSION}/projectsend-${PROJECTSEND_VERSION}.zip" && \ unzip \ /tmp/projectsend.zip -d \ - /app/projectsend && \ - mv /app/projectsend/upload /defaults/ && \ - mv /app/projectsend /app/projectsend-tmp && \ + /app/www/public && \ + mv /app/www/public/upload /defaults/ && \ + mv /app/www/public /app/www/public-tmp && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* -# add local files +# copy local files COPY root/ / -# ports and volumes -EXPOSE 80 -VOLUME /config /data +# ports and volumes +EXPOSE 80 443 +VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 93eb9f1..dd9449c 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15 # set version label ARG BUILD_DATE @@ -11,35 +11,37 @@ RUN \ echo "**** install runtime packages ****" && \ apk add -U --upgrade --no-cache \ curl \ - php7-bcmath \ - php7-bz2 \ - php7-cli \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-fileinfo \ - php7-gd \ - php7-gettext \ - php7-gmp \ - php7-json \ - php7-iconv \ - php7-mbstring \ - php7-mcrypt \ - php7-mysqli \ - php7-openssl \ - php7-pdo \ - php7-pdo_dblib \ - php7-pdo_mysql \ - php7-pecl-apcu \ - php7-pecl-memcached \ - php7-phar \ - php7-soap \ - php7-xmlreader \ - php7-xmlrpc \ - php7-zip \ + php8-bcmath \ + php8-bz2 \ + php8-cli \ + php8-ctype \ + php8-curl \ + php8-dom \ + php8-fileinfo \ + php8-gd \ + php8-gettext \ + php8-gmp \ + php8-iconv \ + php8-json \ + php8-mbstring \ + php8-mysqli \ + php8-openssl \ + php8-pdo \ + php8-pdo_dblib \ + php8-pdo_mysql \ + php8-pecl-apcu \ + php8-pecl-mcrypt \ + php8-pecl-memcached \ + php8-phar \ + php8-soap \ + php8-xmlreader \ + php8-zip \ unzip && \ + apk add --no-cache \ + --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \ + php8-pecl-xmlrpc && \ echo "**** install projectsend ****" && \ - mkdir -p /app/projectsend && \ + mkdir -p /app/www/public && \ if [ -z ${PROJECTSEND_VERSION+x} ]; then \ PROJECTSEND_VERSION=$(curl -sX GET "https://api.github.com/repos/projectsend/projectsend/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ @@ -49,16 +51,16 @@ RUN \ "https://github.com/projectsend/projectsend/releases/download/${PROJECTSEND_VERSION}/projectsend-${PROJECTSEND_VERSION}.zip" && \ unzip \ /tmp/projectsend.zip -d \ - /app/projectsend && \ - mv /app/projectsend/upload /defaults/ && \ - mv /app/projectsend /app/projectsend-tmp && \ + /app/www/public && \ + mv /app/www/public/upload /defaults/ && \ + mv /app/www/public /app/www/public-tmp && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* -# add local files +# copy local files COPY root/ / -# ports and volumes -EXPOSE 80 -VOLUME /config /data +# ports and volumes +EXPOSE 80 443 +VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile index 249e183..11fc6e2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -353,9 +353,11 @@ pipeline { if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then cd ${TEMPDIR}/unraid/templates/ if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then - echo "Image is on the ignore list, removing Unraid template" - git rm unraid/${CONTAINER_NAME}.xml || : - git commit -m 'Bot Removing Deprecated Unraid Template' || : + echo "Image is on the ignore list, marking Unraid template as deprecated" + cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ + git add -u unraid/${CONTAINER_NAME}.xml + git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || : + git commit -m 'Bot Moving Deprecated Unraid Template' || : else cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/ git add unraid/${CONTAINER_NAME}.xml diff --git a/README.md b/README.md index 3574809..e3348fe 100644 --- a/README.md +++ b/README.md @@ -46,17 +46,17 @@ Find us at: ## Supported Architectures -Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). +We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/). -Simply pulling `lscr.io/linuxserver/projectsend` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. +Simply pulling `lscr.io/linuxserver/projectsend:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags. The architectures supported by this image are: -| Architecture | Tag | -| :----: | --- | -| x86-64 | amd64-latest | -| arm64 | arm64v8-latest | -| armhf | arm32v7-latest | +| Architecture | Available | Tag | +| :----: | :----: | ---- | +| x86-64 | ✅ | amd64-\ | +| arm64 | ✅ | arm64v8-\ | +| armhf| ✅ | arm32v7-\ | ## Application Setup @@ -77,7 +77,7 @@ Here are some example snippets to help you get started creating a container. version: "2.1" services: projectsend: - image: lscr.io/linuxserver/projectsend + image: lscr.io/linuxserver/projectsend:latest container_name: projectsend environment: - PUID=1000 @@ -105,7 +105,7 @@ docker run -d \ -v :/config \ -v :/data \ --restart unless-stopped \ - lscr.io/linuxserver/projectsend + lscr.io/linuxserver/projectsend:latest ``` ## Parameters @@ -165,7 +165,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to * container version number * `docker inspect -f '{{ index .Config.Labels "build_version" }}' projectsend` * image version number - * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/projectsend` + * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/projectsend:latest` ## Updating Info @@ -183,7 +183,7 @@ Below are the instructions for updating containers: ### Via Docker Run -* Update the image: `docker pull lscr.io/linuxserver/projectsend` +* Update the image: `docker pull lscr.io/linuxserver/projectsend:latest` * Stop the running container: `docker stop projectsend` * Delete the container: `docker rm projectsend` * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved) @@ -231,6 +231,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)). * **24.06.21:** - Rebasing to alpine 3.14, switch to nginx * **23.01.21:** - Rebasing to alpine 3.13. * **01.06.20:** - Rebasing to alpine 3.12. diff --git a/package_versions.txt b/package_versions.txt index 487152c..74c648c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,118 +1,115 @@ -alpine-baselayout-3.2.0-r16 -alpine-keys-2.4-r0 -apache2-utils-2.4.52-r0 -apk-tools-2.12.7-r0 -apr-1.7.0-r0 -apr-util-1.6.1-r7 +alpine-baselayout-3.2.0-r18 +alpine-keys-2.4-r1 +apache2-utils-2.4.54-r0 +apk-tools-2.12.7-r3 +apr-1.7.0-r1 +apr-util-1.6.1-r11 argon2-libs-20190702-r1 -bash-5.1.4-r0 +bash-5.1.16-r0 brotli-libs-1.0.9-r5 -busybox-1.33.1-r6 -ca-certificates-20191127-r5 -ca-certificates-bundle-20191127-r5 -coreutils-8.32-r2 -curl-7.79.1-r0 -expat-2.4.1-r0 -freetds-1.2.21-r0 -freetype-2.10.4-r1 -gdbm-1.19-r0 -git-2.32.0-r0 -gmp-6.2.1-r0 +busybox-1.34.1-r7 +ca-certificates-20220614-r0 +ca-certificates-bundle-20220614-r0 +coreutils-9.0-r2 +curl-7.80.0-r2 +expat-2.4.7-r0 +freetds-1.3.3-r2 +freetype-2.11.1-r2 +gdbm-1.22-r0 +git-2.34.4-r0 +gmp-6.2.1-r1 libacl-2.2.53-r0 -libattr-2.5.1-r0 -libbsd-0.11.3-r0 +libattr-2.5.1-r1 +libbsd-0.11.3-r1 libbz2-1.0.8-r1 libc-utils-0.7.2-r3 -libcrypto1.1-1.1.1l-r0 -libcurl-7.79.1-r0 -libedit-20210216.3.1-r0 -libgcc-10.3.1_git20210424-r2 +libcrypto1.1-1.1.1q-r0 +libcurl-7.80.0-r2 +libedit-20210910.3.1-r0 +libgcc-10.3.1_git20211027-r0 libice-1.0.10-r0 libintl-0.21-r0 -libjpeg-turbo-2.1.0-r0 -libmagic-5.40-r1 +libjpeg-turbo-2.1.2-r0 libmcrypt-2.5.8-r9 libmd-1.0.3-r0 libmemcached-libs-1.0.18-r4 libpng-1.6.37-r1 libproc-3.3.17-r0 -libressl3.3-libcrypto-3.3.3-r0 -libressl3.3-libssl-3.3.3-r0 -libretls-3.3.3p1-r2 -libsasl-2.1.27-r12 +libretls-3.3.4-r3 +libsasl-2.1.28-r0 libsm-1.2.3-r0 -libssl1.1-1.1.1l-r0 -libstdc++-10.3.1_git20210424-r2 -libuuid-2.37.2-r0 -libwebp-1.2.0-r2 +libssl1.1-1.1.1q-r0 +libstdc++-10.3.1_git20211027-r0 +libuuid-2.37.4-r0 +libwebp-1.2.2-r0 libx11-1.7.2-r0 libxau-1.0.9-r0 libxcb-1.14-r2 libxdmcp-1.1.3-r0 libxext-1.3.4-r0 -libxml2-2.9.12-r1 +libxml2-2.9.14-r1 libxpm-3.5.13-r0 libxt-1.2.1-r0 -libzip-1.7.3-r2 -linux-pam-1.5.1-r1 -logrotate-3.18.1-r0 -musl-1.2.2-r3 -musl-utils-1.2.2-r3 -nano-5.7-r2 -ncurses-libs-6.2_p20210612-r0 -ncurses-terminfo-base-6.2_p20210612-r0 -nghttp2-libs-1.43.0-r0 -nginx-1.20.2-r0 +libzip-1.8.0-r1 +linux-pam-1.5.2-r0 +logrotate-3.18.1-r3 +musl-1.2.2-r7 +musl-utils-1.2.2-r7 +nano-5.9-r0 +ncurses-libs-6.3_p20211120-r1 +ncurses-terminfo-base-6.3_p20211120-r1 +nghttp2-libs-1.46.0-r0 +nginx-1.20.2-r1 oniguruma-6.9.7.1-r0 -openssl-1.1.1l-r0 -pcre-8.44-r0 -pcre2-10.36-r0 -php7-7.4.26-r0 -php7-bcmath-7.4.26-r0 -php7-bz2-7.4.26-r0 -php7-common-7.4.26-r0 -php7-ctype-7.4.26-r0 -php7-curl-7.4.26-r0 -php7-dom-7.4.26-r0 -php7-fileinfo-7.4.26-r0 -php7-fpm-7.4.26-r0 -php7-gd-7.4.26-r0 -php7-gettext-7.4.26-r0 -php7-gmp-7.4.26-r0 -php7-iconv-7.4.26-r0 -php7-json-7.4.26-r0 -php7-mbstring-7.4.26-r0 -php7-mysqli-7.4.26-r0 -php7-mysqlnd-7.4.26-r0 -php7-openssl-7.4.26-r0 -php7-pdo-7.4.26-r0 -php7-pdo_dblib-7.4.26-r0 -php7-pdo_mysql-7.4.26-r0 -php7-pecl-apcu-5.1.21-r0 -php7-pecl-igbinary-3.2.6-r0 -php7-pecl-mcrypt-1.0.4-r0 -php7-pecl-memcached-3.1.5-r2 -php7-phar-7.4.26-r0 -php7-session-7.4.26-r0 -php7-simplexml-7.4.26-r0 -php7-soap-7.4.26-r0 -php7-xml-7.4.26-r0 -php7-xmlreader-7.4.26-r0 -php7-xmlrpc-7.4.26-r0 -php7-xmlwriter-7.4.26-r0 -php7-zip-7.4.26-r0 +openssl-1.1.1q-r0 +pcre-8.45-r1 +pcre2-10.40-r0 +php8-8.0.18-r0 +php8-bcmath-8.0.18-r0 +php8-bz2-8.0.18-r0 +php8-common-8.0.18-r0 +php8-ctype-8.0.18-r0 +php8-curl-8.0.18-r0 +php8-dom-8.0.18-r0 +php8-fileinfo-8.0.18-r0 +php8-fpm-8.0.18-r0 +php8-gd-8.0.18-r0 +php8-gettext-8.0.18-r0 +php8-gmp-8.0.18-r0 +php8-iconv-8.0.18-r0 +php8-mbstring-8.0.18-r0 +php8-mysqli-8.0.18-r0 +php8-mysqlnd-8.0.18-r0 +php8-openssl-8.0.18-r0 +php8-pdo-8.0.18-r0 +php8-pdo_dblib-8.0.18-r0 +php8-pdo_mysql-8.0.18-r0 +php8-pecl-apcu-5.1.21-r0 +php8-pecl-igbinary-3.2.6-r0 +php8-pecl-mcrypt-1.0.4-r0 +php8-pecl-memcached-3.1.5-r1 +php8-pecl-xmlrpc-1.0.0_rc3-r0 +php8-phar-8.0.18-r0 +php8-session-8.0.18-r0 +php8-simplexml-8.0.18-r0 +php8-soap-8.0.18-r0 +php8-xml-8.0.18-r0 +php8-xmlreader-8.0.18-r0 +php8-xmlwriter-8.0.18-r0 +php8-zip-8.0.18-r0 popt-1.18-r0 procps-3.3.17-r0 -readline-8.1.0-r0 -s6-ipcserver-2.10.0.3-r0 -scanelf-1.3.2-r0 -shadow-4.8.1-r0 -skalibs-2.10.0.3-r0 -ssl_client-1.33.1-r6 -tzdata-2021e-r0 +readline-8.1.1-r0 +s6-ipcserver-2.11.0.0-r0 +scanelf-1.3.3-r0 +shadow-4.8.1-r1 +skalibs-2.11.0.0-r0 +ssl_client-1.34.1-r7 +tzdata-2022a-r0 unixodbc-2.3.9-r1 unzip-6.0-r9 -utmps-0.1.0.2-r0 -xz-5.2.5-r0 -xz-libs-5.2.5-r0 -zlib-1.2.11-r3 +utmps-0.1.0.3-r0 +xz-5.2.5-r1 +xz-libs-5.2.5-r1 +zlib-1.2.12-r3 +zstd-libs-1.5.0-r0 diff --git a/root/app/projectsend/index.html b/root/app/projectsend/index.html new file mode 100644 index 0000000..2ac31be --- /dev/null +++ b/root/app/projectsend/index.html @@ -0,0 +1,40 @@ + + + Upgrade Required! + + + +
+

Upgrade Required!

+

The application inside this image has been moved to a new folder.

+

You will need to update your /config/nginx/nginx.conf and /config/nginx/site-confs/default.conf in order for the application to work.

+

New config samples are located at /config/nginx/nginx.conf.sample and /config/nginx/site-confs/default.conf.sample

+

Please review our announcement: Significant changes to nginx based images

+
+ + diff --git a/root/defaults/default b/root/defaults/default deleted file mode 100644 index 062bf67..0000000 --- a/root/defaults/default +++ /dev/null @@ -1,28 +0,0 @@ -#config-v1 -server { - listen 80 default_server; - - listen 443 ssl; - - root /app/projectsend; - index index.html index.htm index.php; - - server_name _; - - ssl_certificate /config/keys/cert.crt; - ssl_certificate_key /config/keys/cert.key; - - client_max_body_size 0; - - location / { - try_files $uri $uri/ /index.php?$query_string; - } - - location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name; - } -} diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config index 7421e0a..24e37c6 100644 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/cont-init.d/30-config @@ -1,8 +1,8 @@ #!/usr/bin/with-contenv bash -if [ -d /app/projectsend-tmp ]; then +if [ -d /app/www/public-tmp ]; then echo "New container detected. Setting up app folder and fixing permissions." - mv /app/projectsend-tmp /app/projectsend + mv /app/www/public-tmp /app/www/public chown -R abc:abc /app fi @@ -24,16 +24,12 @@ sed -i \ -e "s#;*max_file_uploads =.*#max_file_uploads = ${PHP_MAX_FILE_UPLOAD}#i" \ -e "s#;*post_max_size =.*#post_max_size = ${USABLE_MAX_UPLOAD}M#i" \ -e "s#;*cgi.fix_pathinfo=.*#cgi.fix_pathinfo= 0#i" \ - /etc/php7/php.ini - -if ! grep -q 'config-v1' /config/nginx/site-confs/default; then - cp /defaults/default /config/nginx/site-confs -fi + /etc/php8/php.ini # copy config PREV_DIR=$(pwd) -cd /defaults/upload || exit +cd /defaults/upload || exit 1 shopt -s globstar nullglob shopt -s dotglob for i in * @@ -47,16 +43,19 @@ shopt -s dotglob shopt -u globstar nullglob shopt -u dotglob -cd "${PREV_DIR}" || exit +cd "${PREV_DIR}" || exit 1 # create symlinks -[[ ! -L /app/projectsend/upload ]] && \ - ln -sf /data/projectsend /app/projectsend/upload +if [[ ! -L /app/www/public/upload ]]; then + ln -sf /data/projectsend /app/www/public/upload +fi -[[ -f /app/projectsend/includes/sys.config.php ]] && \ - rm /app/projectsend/includes/sys.config.php -[[ ! -L /app/projectsend/includes/sys.config.php ]] && \ - ln -sf /config/projectsend/sys.config.php /app/projectsend/includes/sys.config.php +if [[ -f /app/www/public/includes/sys.config.php ]]; then + rm /app/www/public/includes/sys.config.php +fi +if [[ ! -L /app/www/public/includes/sys.config.php ]]; then + ln -sf /config/projectsend/sys.config.php /app/www/public/includes/sys.config.php +fi #Handle translations mkdir -p /config/translations diff --git a/root/migrations/02-default-location b/root/migrations/02-default-location new file mode 100644 index 0000000..4b2195f --- /dev/null +++ b/root/migrations/02-default-location @@ -0,0 +1,10 @@ +#!/usr/bin/with-contenv bash + +DEFAULT_CONF="/config/nginx/site-confs/default.conf" +OLD_ROOT="root /app/projectsend;" +NEW_ROOT="root /app/www/public;" + +if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}";then + echo "updating root in ${DEFAULT_CONF}" + sed -i "s|${OLD_ROOT}|${NEW_ROOT}|" "${DEFAULT_CONF}" +fi