diff --git a/Dockerfile b/Dockerfile index 48df60f..5eac929 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:3.20 # set version label ARG BUILD_DATE @@ -32,6 +32,7 @@ RUN \ cd /app/pairdrop && \ chown -R abc:abc ./ && \ su -s /bin/sh abc -c 'HOME=/tmp NODE_ENV=production npm ci' && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ $HOME/.cache \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8854ef3..bfcfeec 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -32,6 +32,7 @@ RUN \ cd /app/pairdrop && \ chown -R abc:abc ./ && \ su -s /bin/sh abc -c 'HOME=/tmp NODE_ENV=production npm ci' && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ $HOME/.cache \ diff --git a/Jenkinsfile b/Jenkinsfile index a573688..d2ad071 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,9 +33,9 @@ pipeline { CI_WEB='true' CI_PORT='3000' CI_SSL='false' - CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DELAY='60' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index e454457..8c8e951 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ Enabling WS_FALLBACK provides a fallback if the peer to peer WebRTC connection i This is especially useful if you connect to your instance via a VPN as most VPN services block WebRTC completely in order to hide your real IP address. -*Warning*: All traffic sent between devices using this fallback is routed through the server and therefor not peer to peer! Traffic routed via this fallback is readable by the server and uses the server's bandwidth. +*Warning*: All traffic sent between devices using this fallback is routed through the server and therefore not peer to peer! Traffic routed via this fallback is readable by the server and uses the server's bandwidth. ## Usage @@ -295,6 +295,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **31.05.24:** - Rebase to Alpine 3.20. * **31.01.24:** - Rebase to Alpine 3.19. * **30.05.23:** - Rebase to Alpine 3.18. * **06.03.23:** - Run npm install as non-root user. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 2b2c9c6..d44ab89 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -7,7 +7,6 @@ custom_version_command: "curl -sL https://api.github.com/repos/schlagmichdoch/pa release_type: stable release_tag: latest ls_branch: main -build_armhf: false repo_vars: - EXT_GIT_BRANCH = 'master' - EXT_USER = 'schlagmichdoch' @@ -25,9 +24,9 @@ repo_vars: - CI_WEB='true' - CI_PORT='3000' - CI_SSL='false' - - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DELAY='60' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' sponsor_links: - { name: "PairDrop", url: "https://www.buymeacoffee.com/pairdrop" } diff --git a/readme-vars.yml b/readme-vars.yml index 2997a30..605cb50 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -7,26 +7,15 @@ project_logo: "https://raw.githubusercontent.com/schlagmichdoch/PairDrop/master/ project_blurb: "[PairDrop]({{ project_url }}) is a sublime alternative to AirDrop that works on all platforms. Send images, documents or text via peer to peer connection to devices in the same local network/Wi-Fi or to paired devices." project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" -project_blurb_optional_extras_enabled: false -project_blurb_optional_extras: [] - # supported architectures available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} -# development version -development_versions: false -development_versions_items: - # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" -param_usage_include_net: false - -param_usage_include_env: false - opt_param_usage_include_env: true opt_param_env_vars: - { env_var: "RATE_LIMIT", env_value: "false", desc: "Set to `true` to limit clients to 100 requests per 5 min" } @@ -34,8 +23,6 @@ opt_param_env_vars: - { env_var: "RTC_CONFIG", env_value: "", desc: "Path to a json file containing custom STUN/TURN config (see App Setup notes)" } - { env_var: "DEBUG_MODE", env_value: "false", desc: "Set to `true` to debug the http server configuration by logging clients IP addresses used by PairDrop to STDOUT. [See here for more info](https://github.com/schlagmichdoch/PairDrop/blob/master/docs/host-your-own.md#debug-mode). Do not use in production!" } -param_usage_include_vols: false - param_usage_include_ports: true param_ports: - { external_port: "3000", internal_port: "3000", port_desc: "http gui" } @@ -59,10 +46,11 @@ app_setup_block: | This is especially useful if you connect to your instance via a VPN as most VPN services block WebRTC completely in order to hide your real IP address. - *Warning*: All traffic sent between devices using this fallback is routed through the server and therefor not peer to peer! Traffic routed via this fallback is readable by the server and uses the server's bandwidth. + *Warning*: All traffic sent between devices using this fallback is routed through the server and therefore not peer to peer! Traffic routed via this fallback is readable by the server and uses the server's bandwidth. # changelog changelogs: + - { date: "31.05.24:", desc: "Rebase to Alpine 3.20." } - { date: "31.01.24:", desc: "Rebase to Alpine 3.19." } - { date: "30.05.23:", desc: "Rebase to Alpine 3.18." } - { date: "06.03.23:", desc: "Run npm install as non-root user." }