Skip to content

Commit 3bdfb6d

Browse files
authored
Merge pull request #83 from linuxserver/master-3.20
2 parents add3b2a + 87c7356 commit 3bdfb6d

File tree

6 files changed

+13
-26
lines changed

6 files changed

+13
-26
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.19
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.20
44

55
# set version label
66
ARG BUILD_DATE
@@ -46,6 +46,7 @@ RUN \
4646
ln -s /usr/bin/ddclient.in /usr/bin/ddclient && \
4747
mkdir -p /etc/ddclient/ && \
4848
cp /tmp/ddclient/sample-get-ip-from-fritzbox /etc/ddclient/get-ip-from-fritzbox && \
49+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
4950
echo "**** cleanup ****" && \
5051
apk del --purge \
5152
build-dependencies && \

Dockerfile.aarch64

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
44

55
# set version label
66
ARG BUILD_DATE
@@ -46,6 +46,7 @@ RUN \
4646
ln -s /usr/bin/ddclient.in /usr/bin/ddclient && \
4747
mkdir -p /etc/ddclient/ && \
4848
cp /tmp/ddclient/sample-get-ip-from-fritzbox /etc/ddclient/get-ip-from-fritzbox && \
49+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
4950
echo "**** cleanup ****" && \
5051
apk del --purge \
5152
build-dependencies && \

Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ pipeline {
3333
CI_WEB='false'
3434
CI_PORT='80'
3535
CI_SSL='false'
36-
CI_DELAY='30'
37-
CI_DOCKERENV='TZ=US/Pacific'
38-
CI_AUTH='user:password'
36+
CI_DELAY='120'
37+
CI_DOCKERENV=''
38+
CI_AUTH=''
3939
CI_WEBPATH=''
4040
}
4141
stages {

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
273273

274274
## Versions
275275

276+
* **27.06.24:** - Rebase to Alpine 3.20.
276277
* **23.12.23:** - Rebase to Alpine 3.19.
277278
* **25.08.23:** - Rebase to Alpine 3.18.
278279
* **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)

jenkins-vars.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ repo_vars:
2323
- CI_WEB='false'
2424
- CI_PORT='80'
2525
- CI_SSL='false'
26-
- CI_DELAY='30'
27-
- CI_DOCKERENV='TZ=US/Pacific'
28-
- CI_AUTH='user:password'
26+
- CI_DELAY='120'
27+
- CI_DOCKERENV=''
28+
- CI_AUTH=''
2929
- CI_WEBPATH=''

readme-vars.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,16 @@ project_url: "https://github.com/ddclient/ddclient"
66
project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/ddclient-logo.png"
77
project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
88
project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a Perl client used to update dynamic DNS entries for accounts on Dynamic DNS Network Service Provider. It was originally written by Paul Burry and is now mostly by wimpunk. It has the capability to update more than just dyndns and it can fetch your WAN-ipaddress in a few different ways."
9-
project_blurb_optional_extras_enabled: false
109
# supported architectures
1110
available_architectures:
1211
- {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
1312
- {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
14-
# development version
15-
development_versions: false
1613
# container parameters
1714
common_param_env_vars_enabled: true
1815
param_container_name: "{{ project_name }}"
19-
param_usage_include_net: false
20-
param_usage_include_env: true
21-
param_env_vars:
22-
- {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London."}
2316
param_usage_include_vols: true
2417
param_volumes:
2518
- { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
26-
param_usage_include_ports: false
27-
param_device_map: false
28-
cap_add_param: false
29-
# optional container parameters
30-
opt_param_usage_include_env: false
31-
opt_param_usage_include_vols: false
32-
opt_param_usage_include_ports: false
33-
opt_param_device_map: false
34-
opt_cap_add_param: false
35-
optional_block_1: false
3619
# application setup block
3720
app_setup_block_enabled: true
3821
app_setup_block: |
@@ -45,7 +28,8 @@ app_setup_block: |
4528
````
4629
# changelog
4730
changelogs:
48-
- { date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
31+
- {date: "27.06.24:", desc: "Rebase to Alpine 3.20."}
32+
- {date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
4933
- {date: "25.08.23:", desc: "Rebase to Alpine 3.18."}
5034
- {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
5135
- {date: "13.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3."}

0 commit comments

Comments
 (0)