Skip to content

Commit 086bac1

Browse files
committed
Rebase to 3.20
1 parent 3486e5e commit 086bac1

File tree

6 files changed

+12
-17
lines changed

6 files changed

+12
-17
lines changed

Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
FROM ghcr.io/linuxserver/picons-builder as piconsstage
66

77

8-
FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage
8+
FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage
99
############## build stage ##############
1010

1111
# package versions
@@ -149,7 +149,7 @@ RUN \
149149
/picons
150150

151151
############## runtime stage ##############
152-
FROM ghcr.io/linuxserver/baseimage-alpine:3.19
152+
FROM ghcr.io/linuxserver/baseimage-alpine:3.20
153153

154154
# set version label
155155
ARG BUILD_DATE
@@ -196,7 +196,8 @@ RUN \
196196
x264 \
197197
x265 \
198198
xmltv \
199-
zlib
199+
zlib && \
200+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version
200201

201202
# copy local files and buildstage artifacts
202203
COPY --from=buildstage /tmp/argtable-build/usr/ /usr/

Dockerfile.aarch64

+2-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ RUN \
195195
x264 \
196196
x265 \
197197
xmltv \
198-
zlib
198+
zlib && \
199+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version
199200

200201
# copy local files and buildstage artifacts
201202
COPY --from=buildstage /tmp/argtable-build/usr/ /usr/

Jenkinsfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ pipeline {
3434
CI_PORT='9981'
3535
CI_SSL='false'
3636
CI_DELAY='120'
37-
CI_DOCKERENV='TZ=US/Pacific'
38-
CI_AUTH='user:password'
37+
CI_DOCKERENV=''
38+
CI_AUTH=''
3939
CI_WEBPATH=''
4040
}
4141
stages {

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
351351

352352
## Versions
353353

354+
* **25.06.24:** - Rebase to Alpine 3.20.
354355
* **20.03.24:** - Rebase to Alpine 3.19.
355356
* **16.10.23:** - Add mesa-va-gallium package for AMD transcoding.
356357
* **20.09.23:** - Add perl-json-xs package.

jenkins-vars.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ external_type: github_commit
66
release_type: stable
77
release_tag: latest
88
ls_branch: master
9-
build_armhf: false
109
repo_vars:
1110
- EXT_GIT_BRANCH = 'master'
1211
- EXT_USER = 'tvheadend'
@@ -25,6 +24,6 @@ repo_vars:
2524
- CI_PORT='9981'
2625
- CI_SSL='false'
2726
- CI_DELAY='120'
28-
- CI_DOCKERENV='TZ=US/Pacific'
29-
- CI_AUTH='user:password'
27+
- CI_DOCKERENV=''
28+
- CI_AUTH=''
3029
- CI_WEBPATH=''

readme-vars.yml

+1-8
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,12 @@ project_blurb: |
99
Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.
1010
Multiple EPG sources are supported (over-the-air DVB and ATSC including OpenTV DVB extensions, XMLTV, PyXML).
1111
project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
12-
project_blurb_optional_extras_enabled: false
1312

1413
# supported architectures
1514
available_architectures:
1615
- { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
1716
- { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
1817

19-
# development version
20-
# development version
21-
development_versions: false
22-
development_versions_items:
23-
- { tag: "latest", desc: "Current latest release." }
24-
- { tag: "release-4.2", desc: "Latest release from 4.2 branch." }
25-
2618
# container parameters
2719
common_param_env_vars_enabled: true
2820
param_container_name: "{{ project_name }}"
@@ -114,6 +106,7 @@ app_setup_block: |
114106
115107
# changelog
116108
changelogs:
109+
- { date: "25.06.24:", desc: "Rebase to Alpine 3.20." }
117110
- { date: "20.03.24:", desc: "Rebase to Alpine 3.19." }
118111
- { date: "16.10.23:", desc: "Add mesa-va-gallium package for AMD transcoding." }
119112
- { date: "20.09.23:", desc: "Add perl-json-xs package." }

0 commit comments

Comments
 (0)