From 05480b111835298099c35acea0dda0d854cc1a20 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Wed, 21 Aug 2024 12:18:48 -0400 Subject: [PATCH 1/2] rebase to noble --- Dockerfile | 10 +++------- Dockerfile.aarch64 | 10 +++------- Jenkinsfile | 4 ++-- README.md | 7 ++++--- jenkins-vars.yml | 4 ++-- readme-vars.yml | 13 +++---------- 6 files changed, 17 insertions(+), 31 deletions(-) diff --git a/Dockerfile b/Dockerfile index dd4ba79..9aec63c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy +FROM ghcr.io/linuxserver/baseimage-ubuntu:noble # set version label ARG BUILD_DATE @@ -10,16 +10,12 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thelamer" RUN \ - echo "**** install packages ****" && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - gnupg && \ echo "**** install resilio-sync ****" && \ if [ -z ${SYNC_VERSION+x} ]; then \ SYNC_VERSION=$(curl -sX GET https://linux-packages.resilio.com/resilio-sync/deb/dists/resilio-sync/non-free/binary-amd64/Packages |grep -A 7 -m 1 'Package: resilio-sync' | awk -F ': ' '/Version/{print $2;exit}'); \ fi && \ - echo "deb https://linux-packages.resilio.com/resilio-sync/deb resilio-sync non-free" | tee /etc/apt/sources.list.d/resilio-sync.list && \ - curl -L https://linux-packages.resilio.com/resilio-sync/key.asc | apt-key add && \ + curl -fsSL https://linux-packages.resilio.com/resilio-sync/key.asc | tee /usr/share/keyrings/resilio-sync.asc >/dev/null && \ + echo "deb [aarch=amd64 signed-by=/usr/share/keyrings/resilio-sync.asc] https://linux-packages.resilio.com/resilio-sync/deb resilio-sync non-free" > /etc/apt/sources.list.d/resilio-sync.list && \ apt-get update && \ apt-get install -y --no-install-recommends \ "resilio-sync=${SYNC_VERSION}" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e7621aa..29a513f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble # set version label ARG BUILD_DATE @@ -10,16 +10,12 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thelamer" RUN \ - echo "**** install packages ****" && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - gnupg && \ echo "**** install resilio-sync ****" && \ if [ -z ${SYNC_VERSION+x} ]; then \ SYNC_VERSION=$(curl -sX GET https://linux-packages.resilio.com/resilio-sync/deb/dists/resilio-sync/non-free/binary-amd64/Packages |grep -A 7 -m 1 'Package: resilio-sync' | awk -F ': ' '/Version/{print $2;exit}'); \ fi && \ - echo "deb https://linux-packages.resilio.com/resilio-sync/deb resilio-sync non-free" | tee /etc/apt/sources.list.d/resilio-sync.list && \ - curl -L https://linux-packages.resilio.com/resilio-sync/key.asc | apt-key add && \ + curl -fsSL https://linux-packages.resilio.com/resilio-sync/key.asc | tee /usr/share/keyrings/resilio-sync.asc >/dev/null && \ + echo "deb [aarch=arm64 signed-by=/usr/share/keyrings/resilio-sync.asc] https://linux-packages.resilio.com/resilio-sync/deb resilio-sync non-free" > /etc/apt/sources.list.d/resilio-sync.list && \ apt-get update && \ apt-get install -y --no-install-recommends \ "resilio-sync=${SYNC_VERSION}" && \ diff --git a/Jenkinsfile b/Jenkinsfile index 9126eb1..1ac9480 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,8 +33,8 @@ pipeline { CI_PORT='8888' CI_SSL='false' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='/gui' } stages { diff --git a/README.md b/README.md index 772ccda..23f2cf0 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Find us at: [Resilio-sync](https://www.resilio.com/individuals/) (formerly BitTorrent Sync) uses the BitTorrent protocol to sync files and folders between all of your devices. There are both free and paid versions, this container supports both. There is an official sync image but we created this one as it supports user mapping to simplify permissions for volumes. -[![resilio-sync](https://www.resilio.com/img/individual/freeproduct.jpg)](https://www.resilio.com/individuals/) +[![resilio-sync](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/resilio-sync-logo.png)](https://www.resilio.com/individuals/) ## Supported Architectures @@ -79,7 +79,7 @@ services: - PGID=1000 - TZ=Etc/UTC volumes: - - /path/to/config:/config + - /path/to/resilio-sync/config:/config - /path/to/downloads:/downloads - /path/to/data:/sync ports: @@ -98,7 +98,7 @@ docker run -d \ -e TZ=Etc/UTC \ -p 8888:8888 \ -p 55555:55555 \ - -v /path/to/config:/config \ + -v /path/to/resilio-sync/config:/config \ -v /path/to/downloads:/downloads \ -v /path/to/data:/sync \ --restart unless-stopped \ @@ -281,6 +281,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **21.08.24:** - Rebase to Noble. * **03.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **14.12.22:** - Rebase to Jammy, migrate to s6v3. * **03.10.21:** - Use upstream apt repo to install. Rebase to focal. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 935696a..ce993ee 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -22,6 +22,6 @@ repo_vars: - CI_PORT='8888' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='/gui' diff --git a/readme-vars.yml b/readme-vars.yml index 0b1a9a3..ed4fa77 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -3,7 +3,7 @@ # project information project_name: resilio-sync project_url: "https://www.resilio.com/individuals/" -project_logo: "https://www.resilio.com/img/individual/freeproduct.jpg" +project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/resilio-sync-logo.png" project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) (formerly BitTorrent Sync) uses the BitTorrent protocol to sync files and folders between all of your devices. There are both free and paid versions, this container supports both. There is an official sync image but we created this one as it supports user mapping to simplify permissions for volumes." project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" project_blurb_optional_extras_enabled: false @@ -11,26 +11,18 @@ project_blurb_optional_extras_enabled: false 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."} -opt_param_usage_include_env: false param_usage_include_vols: true param_volumes: - - {vol_path: "/config", vol_host_path: "/path/to/config", desc: "Where resilio-sync should store its config file."} + - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Where resilio-sync should store its config file."} - {vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "Folder for downloads/cache."} - {vol_path: "/sync", vol_host_path: "/path/to/data", desc: "Sync folders root."} param_usage_include_ports: true param_ports: - {external_port: "8888", internal_port: "8888", port_desc: "WebUI"} - {external_port: "55555", internal_port: "55555", port_desc: "Sync Port."} -param_device_map: false cap_add_param: false # application setup block app_setup_block_enabled: true @@ -39,6 +31,7 @@ app_setup_block: | * More info on setup at [Resilio Sync]({{ project_url }}) # changelog changelogs: + - {date: "21.08.24:", desc: "Rebase to Noble."} - {date: "03.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "14.12.22:", desc: "Rebase to Jammy, migrate to s6v3."} - {date: "03.10.21:", desc: "Use upstream apt repo to install. Rebase to focal."} From b0ea04f94048e1173a4b23bb34f221b2aaee2efa Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Wed, 21 Aug 2024 13:21:29 -0400 Subject: [PATCH 2/2] add version to image --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 9aec63c..9a3c1c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,7 @@ RUN \ apt-get update && \ apt-get install -y --no-install-recommends \ "resilio-sync=${SYNC_VERSION}" && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 29a513f..161b1a7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -19,6 +19,7 @@ RUN \ apt-get update && \ apt-get install -y --no-install-recommends \ "resilio-sync=${SYNC_VERSION}" && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \