Rebase to 3.20

linuxserver · Aug 27, 2024 · 73bdd09 · 73bdd09
1 parent a8839ac
commit 73bdd09
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 23 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20 AS buildstage
 ############## build stage ##############
 
 ARG DAAPD_RELEASE
@@ -12,14 +14,12 @@ RUN \
     avahi-dev \
     bison \
     bsd-compat-headers \
+    build-base \
     confuse-dev \
     curl-dev \
     ffmpeg-dev \
-    file \
     flac-dev \
     flex \
-    g++ \
-    gcc \
     gettext-dev \
     gnutls-dev \
     gperf \
@@ -33,7 +33,6 @@ RUN \
     libtool \
     libunistring-dev \
     libwebsockets-dev \
-    make \
     mxml-dev \
     openjdk8-jre-base \
     protobuf-c-dev \
@@ -70,7 +69,7 @@ RUN \
   mv /tmp/daapd-build/etc/owntone.conf /tmp/daapd-build/etc/owntone.conf.orig && \
   rm -rf /tmp/daapd-build/var
 ############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -100,7 +99,8 @@ RUN \
     sqlite-libs && \
   apk add -U --update --no-cache --repository https://dl-cdn.alpinelinux.org/alpine/edge/testing \
     librespot && \
-  mkdir -p /music
+  mkdir -p /music && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version
 
 # copy buildstage and local files
 COPY --from=buildstage /tmp/daapd-build/ /

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 as buildstage
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 AS buildstage
 ############## build stage ##############
 
 ARG DAAPD_RELEASE
@@ -12,14 +14,12 @@ RUN \
     avahi-dev \
     bison \
     bsd-compat-headers \
+    build-base \
     confuse-dev \
     curl-dev \
     ffmpeg-dev \
-    file \
     flac-dev \
     flex \
-    g++ \
-    gcc \
     gettext-dev \
     gnutls-dev \
     gperf \
@@ -32,7 +32,6 @@ RUN \
     libtool \
     libunistring-dev \
     libwebsockets-dev \
-    make \
     mxml-dev \
     openjdk8-jre-base \
     openssl-dev \
@@ -70,7 +69,7 @@ RUN \
   mv /tmp/daapd-build/etc/owntone.conf /tmp/daapd-build/etc/owntone.conf.orig && \
   rm -rf /tmp/daapd-build/var
 ############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
 
 # set version label
 ARG BUILD_DATE
@@ -100,7 +99,8 @@ RUN \
     sqlite-libs && \
   apk add -U --update --no-cache --repository https://dl-cdn.alpinelinux.org/alpine/edge/testing \
     librespot && \
-  mkdir -p /music
+  mkdir -p /music && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version
 
 # copy buildstage and local files
 COPY --from=buildstage /tmp/daapd-build/ /

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -36,8 +36,8 @@ pipeline {
     CI_PORT='3689'
     CI_SSL='false'
     CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
-    CI_AUTH='user:password'
+    CI_DOCKERENV=''
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {

diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ Find us at:
 
 [Daapd](https://owntone.github.io/owntone-server/) (iTunes) media server with support for AirPlay devices, Apple Remote (and compatibles), Chromecast, MPD and internet radio.
 
-[![daapd](https://raw.githubusercontent.com/linuxserver/beta-templates/master/lsiodev/img/daapd-git.png)](https://owntone.github.io/owntone-server/)
+[![daapd](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/daapd-icon.png)](https://owntone.github.io/owntone-server/)
 
 ## Supported Architectures
 
@@ -289,6 +289,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **27.08.24:** - Rebase to Alpine 3.20.
 * **20.03.24:** - Rebase to Alpine 3.19.
 * **25.08.23:** - Rebase to Alpine 3.18, remove abandoned libspotify libs.
 * **05.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)

diff --git a/jenkins-vars.yml b/jenkins-vars.yml
@@ -24,6 +24,6 @@ repo_vars:
   - CI_PORT='3689'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH=''
diff --git a/readme-vars.yml b/readme-vars.yml
@@ -3,16 +3,13 @@
 # project information
 project_name: daapd
 project_url: "https://owntone.github.io/owntone-server/"
-project_logo: "https://raw.githubusercontent.com/linuxserver/beta-templates/master/lsiodev/img/daapd-git.png"
+project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/daapd-icon.png"
 project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) (iTunes) media server with support for AirPlay devices, Apple Remote (and compatibles), Chromecast, MPD and internet radio."
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
-project_blurb_optional_extras_enabled: false
 # supported architectures
 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 }}"
@@ -46,6 +43,7 @@ app_setup_block: |
   It is recommended to set the `pipe_autostart` option to `true` in your forked-daapd config.
 # changelog
 changelogs:
+  - {date: "27.08.24:", desc: "Rebase to Alpine 3.20."}
   - {date: "20.03.24:", desc: "Rebase to Alpine 3.19."}
   - {date: "25.08.23:", desc: "Rebase to Alpine 3.18, remove abandoned libspotify libs."}
   - {date: "05.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}