Merge pull request #41 from linuxserver/3.20

Rebase to 3.20

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -24,11 +24,10 @@ RUN \
  php83-pdo_dblib \
  php83-pdo_mysql \
  php83-pecl-apcu \
+ php83-pecl-mcrypt \
  php83-pecl-memcached \
  php83-soap \
  php83-xmlreader && \
- apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
- php83-pecl-mcrypt && \
  echo "**** install projectsend ****" && \
  mkdir -p /app/www/public && \
  if [ -z ${PROJECTSEND_VERSION+x} ]; then \
@@ -45,6 +44,7 @@ RUN \
  /app/www/public && \
  mv /app/www/public/upload /defaults/ && \
  mv /app/www/public /app/www/public-tmp && \
+ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
  echo "**** cleanup ****" && \
  rm -rf \
  /tmp/*

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20
 
 # set version label
 ARG BUILD_DATE
@@ -24,11 +24,10 @@ RUN \
  php83-pdo_dblib \
  php83-pdo_mysql \
  php83-pecl-apcu \
+ php83-pecl-mcrypt \
  php83-pecl-memcached \
  php83-soap \
  php83-xmlreader && \
- apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
- php83-pecl-mcrypt && \
  echo "**** install projectsend ****" && \
  mkdir -p /app/www/public && \
  if [ -z ${PROJECTSEND_VERSION+x} ]; then \
@@ -45,6 +44,7 @@ RUN \
  /app/www/public && \
  mv /app/www/public/upload /defaults/ && \
  mv /app/www/public /app/www/public-tmp && \
+ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
  echo "**** cleanup ****" && \
  rm -rf \
  /tmp/*

Jenkinsfile

@@ -34,8 +34,8 @@ pipeline {
  CI_PORT='80'
  CI_SSL='false'
  CI_DELAY='120'
- CI_DOCKERENV='TZ=US/Pacific'
- CI_AUTH='user:password'
+ CI_DOCKERENV=''
+ CI_AUTH=''
  CI_WEBPATH='/install/make-config.php'
  }
  stages {

README.md

@@ -283,6 +283,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **06.06.24:** - Rebase to Alpine 3.20.
 * **23.12.23:** - Rebase to Alpine 3.19 with php 8.3.
 * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
 * **08.03.23:** - Rebasing to alpine 3.17 and upgrading to s6v3.

jenkins-vars.yml

@@ -6,7 +6,6 @@ external_type: github_stable
 release_type: stable
 release_tag: latest
 ls_branch: master
-build_armhf: false
 repo_vars:
  - EXT_GIT_BRANCH = 'master'
  - EXT_USER = 'projectsend'
@@ -25,6 +24,6 @@ repo_vars:
  - CI_PORT='80'
  - CI_SSL='false'
  - CI_DELAY='120'
- - CI_DOCKERENV='TZ=US/Pacific'
- - CI_AUTH='user:password'
+ - CI_DOCKERENV=''
+ - CI_AUTH=''
  - CI_WEBPATH='/install/make-config.php'

readme-vars.yml

@@ -13,16 +13,13 @@ available_architectures:
  - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
 
-# development version
-development_versions: false
 
 # container parameters
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
 param_usage_include_net: false
 param_usage_include_env: true
 param_env_vars:
- - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
  - { env_var: "MAX_UPLOAD", env_value: "5000", desc: "To set maximum upload size (in MB), default if unset is 5000." }
 param_usage_include_vols: true
 param_volumes:
@@ -31,22 +28,12 @@ param_volumes:
 param_usage_include_ports: true
 param_ports:
  - { external_port: "80", internal_port: "80", port_desc: "WebUI" }
-param_device_map: false
-cap_add_param: false
-
-# optional container parameters
-opt_param_usage_include_env: false
-opt_param_usage_include_vols: false
-opt_param_usage_include_ports: false
-opt_param_device_map: false
-opt_cap_add_param: false
-optional_block_1: false
 
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
  *IMPORTANT* This image no longer supports MSSQL since being migrated to PHP7, if you want MSSQL support please use the tag `linuxserver/projectsend:r1053-ls27`
- 
+
  Requires a user and database in either mysql or mariadb.
 
  To use translations, follow the instructions [here](https://www.projectsend.org/how-to-use-translation-files/). The necessary paths are symlinked under `/config/translations` (note that the "templates" paths don't need `lang` subdirectories).
@@ -55,6 +42,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+ - { date: "06.06.24:", desc: "Rebase to Alpine 3.20."}
  - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}
  - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
  - { date: "08.03.23:", desc: "Rebasing to alpine 3.17 and upgrading to s6v3." }