Skip to content

Commit

Permalink
Merge pull request #201 from linuxserver/print-version
Browse files Browse the repository at this point in the history
Print version on init
  • Loading branch information
thespad authored Jun 25, 2024
2 parents de18177 + 68fe794 commit eb0fc2e
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 15 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ RUN \
&& awk '/^P:deluge$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
fi && \
apk add -U --upgrade --no-cache \
deluge==${DELUGE_VERSION} && \
deluge==${DELUGE_VERSION} && \
echo "**** grab GeoIP database ****" && \
curl -L --retry 10 --retry-max-time 60 --retry-all-errors \
"https://mailfud.org/geoip-legacy/GeoIP.dat.gz" \
| gunzip > /usr/share/GeoIP/GeoIP.dat && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ RUN \
&& awk '/^P:deluge$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://'); \
fi && \
apk add -U --upgrade --no-cache \
deluge==${DELUGE_VERSION} && \
deluge==${DELUGE_VERSION} && \
echo "**** grab GeoIP database ****" && \
curl -L --retry 10 --retry-max-time 60 --retry-all-errors \
"https://mailfud.org/geoip-legacy/GeoIP.dat.gz" \
| gunzip > /usr/share/GeoIP/GeoIP.dat && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ pipeline {
CI_PORT='8112'
CI_SSL='false'
CI_DELAY='300'
CI_DOCKERENV='TZ=US/Pacific'
CI_AUTH='user:password'
CI_DOCKERENV=''
CI_AUTH=''
CI_WEBPATH=''
}
stages {
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ services:
- DELUGE_LOGLEVEL=error #optional
volumes:
- /path/to/deluge/config:/config
- /path/to/your/downloads:/downloads
- /path/to/downloads:/downloads
ports:
- 8112:8112
- 6881:6881
Expand All @@ -112,7 +112,7 @@ docker run -d \
-p 6881:6881/udp \
-p 58846:58846 `#optional` \
-v /path/to/deluge/config:/config \
-v /path/to/your/downloads:/downloads \
-v /path/to/downloads:/downloads \
--restart unless-stopped \
lscr.io/linuxserver/deluge:latest
```
Expand Down
5 changes: 2 additions & 3 deletions jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ external_type: alpine_repo
release_type: stable
release_tag: latest
ls_branch: master
build_armhf: false
repo_vars:
- BUILD_VERSION_ARG = 'DELUGE_VERSION'
- LS_USER = 'linuxserver'
Expand All @@ -25,6 +24,6 @@ repo_vars:
- CI_PORT='8112'
- CI_SSL='false'
- CI_DELAY='300'
- CI_DOCKERENV='TZ=US/Pacific'
- CI_AUTH='user:password'
- CI_DOCKERENV=''
- CI_AUTH=''
- CI_WEBPATH=''
9 changes: 3 additions & 6 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,13 @@ available_architectures:
param_container_name: "{{ project_name }}"
param_usage_include_vols: true
param_volumes:
- { vol_path: "/config", vol_host_path: "/path/to/deluge/config", desc: "deluge configs" }
- { vol_path: "/downloads", vol_host_path: "/path/to/your/downloads", desc: "torrent download directory" }
- { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "deluge configs" }
- { vol_path: "/downloads", vol_host_path: "/path/to/downloads", desc: "torrent download directory" }
param_usage_include_ports: true
param_ports:
- { external_port: "8112", internal_port: "8112", port_desc: "Port for webui" }
- { external_port: "6881", internal_port: "6881", port_desc: "Inbound torrent traffic (See App Setup)" }
- { external_port: "6881", internal_port: "6881/udp", port_desc: "Inbound torrent traffic (See App Setup)" }
param_usage_include_env: true
param_env_vars:
- { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use"}
# optional env variables
opt_param_usage_include_env: true
opt_param_env_vars:
Expand Down Expand Up @@ -63,7 +60,7 @@ changelogs:
- { date: "12.08.22:", desc: "Bump unrar to 6.1.7." }
- { date: "16.06.22:", desc: "Rebase to Alpine 3.16 from edge." }
- { date: "22.02.22:", desc: "Rebase to Alpine, config on first startup, add GeoIP." }
- { date: "15.01.22:", desc: "Rebase to Focal." }
- { date: "15.01.22:", desc: "Rebase to Focal." }
- { date: "07.06.21:", desc: "Remove host networking from readme examples" }
- { date: "23.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
- { date: "09.05.19:", desc: "Add python3 requests and future modules." }
Expand Down

0 comments on commit eb0fc2e

Please sign in to comment.