Merge branch 'master' into nwhyte/librespot-device-name

linuxserver · Apr 8, 2024 · 7f76f61 · 7f76f61
2 parents 8947625 + b5a089b
commit 7f76f61
Show file tree

Hide file tree

Showing 11 changed files with 662 additions and 361 deletions.
diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml
@@ -67,10 +67,10 @@ body:
   - type: textarea
     attributes:
       description: |
-        Provide a full docker log, output of "docker logs linuxserver.io"
+        Provide a full docker log, output of "docker logs daapd"
       label: Container logs
       placeholder: |
-        Output of `docker logs linuxserver.io`
+        Output of `docker logs daapd`
       render: bash
     validations:
       required: true
diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml
@@ -7,7 +7,7 @@ jobs:
   external-trigger-master:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
 
       - name: External Trigger
         if: github.ref == 'refs/heads/master'

diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml
@@ -9,7 +9,7 @@ jobs:
   external-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: '0'
 

diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml
@@ -7,7 +7,7 @@ jobs:
   package-trigger-master:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
 
       - name: Package Trigger
         if: github.ref == 'refs/heads/master'

diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml
@@ -9,7 +9,7 @@ jobs:
   package-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: '0'
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,7 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.17 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage
 ############## build stage ##############
 
 ARG DAAPD_RELEASE
-ARG LIBSPOTIFY_VERSION=12.1.51
-ARG ARCH=x86_64
 
 RUN \
   echo "**** install build packages ****" && \
@@ -41,40 +39,13 @@ RUN \
     protobuf-c-dev \
     sqlite-dev \
     taglib-dev && \
-  echo "**** make antlr wrapper ****" && \
   mkdir -p \
     /tmp/source/owntone && \
-  echo \
-    "#!/bin/bash" > /tmp/source/antlr3 && \
-  echo \
-    "exec java -cp /tmp/source/antlr-3.4-complete.jar org.antlr.Tool \"\$@\"" >> /tmp/source/antlr3 && \
-  chmod a+x /tmp/source/antlr3 && \
-  curl -o \
-    /tmp/source/antlr-3.4-complete.jar -L \
-    http://www.antlr3.org/download/antlr-3.4-complete.jar && \
-  echo "**** compile and install antlr3c ****" && \
-  curl -o \
-    /tmp/libantlr3c-3.4.tar.gz -L \
-    https://github.com/antlr/website-antlr3/raw/gh-pages/download/C/libantlr3c-3.4.tar.gz && \
-  tar xf /tmp/libantlr3c-3.4.tar.gz  -C /tmp && \
-  cd /tmp/libantlr3c-3.4 && \
-  ./configure --enable-64bit --prefix=/usr && \
-  make && \
-  make DESTDIR=/tmp/antlr3c-build install && \
-  export LDFLAGS="-L/tmp/antlr3c-build/usr/lib" && \
-  export CFLAGS="-I/tmp/antlr3c-build/usr/include" && \
   echo "**** compile owntone-server ****" && \
   if [ -z ${DAAPD_RELEASE+x} ]; then \
     DAAPD_RELEASE=$(curl -sX GET "https://api.github.com/repos/owntone/owntone-server/releases/latest" \
     | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   fi && \
-  curl -L https://github.com/mopidy/libspotify-archive/blob/master/libspotify-${LIBSPOTIFY_VERSION}-Linux-${ARCH}-release.tar.gz?raw=true | tar -xzf- -C /tmp/source/ && \
-  mv /tmp/source/libspotify* /tmp/source/libspotify && \
-  sed -i 's/ldconfig//' /tmp/source/libspotify/Makefile && \
-  make -C /tmp/source/libspotify prefix=/tmp/libspotify-build install && \
-  rm -rf /tmp/source/libspotify && \
-  export LIBSPOTIFY_CFLAGS="-I/tmp/libspotify-build/include" && \
-  export LIBSPOTIFY_LIBS="/tmp/libspotify-build/lib/libspotify.so" && \
   curl -o \
   /tmp/source/owntone.tar.gz -L \
     "https://github.com/owntone/owntone-server/archive/${DAAPD_RELEASE}.tar.gz" && \
@@ -86,10 +57,8 @@ RUN \
   ./configure \
     --build=$CBUILD \
     --enable-chromecast \
-    --enable-itunes \
     --enable-lastfm \
     --enable-mpd \
-    --enable-spotify \
     --host=$CHOST \
     --infodir=/usr/share/info \
     --localstatedir=/var \
@@ -101,7 +70,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.17
+FROM ghcr.io/linuxserver/baseimage-alpine:3.19
 
 # set version label
 ARG BUILD_DATE
@@ -116,6 +85,7 @@ RUN \
     confuse \
     dbus \
     ffmpeg \
+    gnutls \
     json-c \
     libevent \
     libgcrypt \
@@ -134,8 +104,6 @@ RUN \
 
 # copy buildstage and local files
 COPY --from=buildstage /tmp/daapd-build/ /
-COPY --from=buildstage /tmp/antlr3c-build/ /
-COPY --from=buildstage /tmp/libspotify-build/ /
 COPY root/ /
 
 # ports and volumes

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19 as buildstage
 ############## build stage ##############
 
 ARG DAAPD_RELEASE
@@ -39,28 +39,8 @@ RUN \
     protobuf-c-dev \
     sqlite-dev \
     taglib-dev && \
-  echo "**** make antlr wrapper ****" && \
   mkdir -p \
     /tmp/source/owntone && \
-  echo \
-    "#!/bin/bash" > /tmp/source/antlr3 && \
-  echo \
-    "exec java -cp /tmp/source/antlr-3.4-complete.jar org.antlr.Tool \"\$@\"" >> /tmp/source/antlr3 && \
-  chmod a+x /tmp/source/antlr3 && \
-  curl -o \
-    /tmp/source/antlr-3.4-complete.jar -L \
-    http://www.antlr3.org/download/antlr-3.4-complete.jar && \
- echo "**** compile and install antlr3c ****" && \
-  curl -o \
-    /tmp/libantlr3c-3.4.tar.gz -L \
-    https://github.com/antlr/website-antlr3/raw/gh-pages/download/C/libantlr3c-3.4.tar.gz && \
-  tar xf /tmp/libantlr3c-3.4.tar.gz  -C /tmp && \
-  cd /tmp/libantlr3c-3.4 && \
-  ./configure --build arm-unknown-linux-gnueabi --disable-abiflags --disable-antlrdebug --enable-64bit --prefix=/usr && \
-  make && \
-  make DESTDIR=/tmp/antlr3c-build install && \
-  export LDFLAGS="-L/tmp/antlr3c-build/usr/lib" && \
-  export CFLAGS="-I/tmp/antlr3c-build/usr/include" && \
   echo "**** compile owntone-server ****" && \
   if [ -z ${DAAPD_RELEASE+x} ]; then \
     DAAPD_RELEASE=$(curl -sX GET "https://api.github.com/repos/owntone/owntone-server/releases/latest" \
@@ -76,9 +56,7 @@ RUN \
   autoreconf -i -v && \
   ./configure \
     --build=$CBUILD \
-    --disable-avcodecsend \
     --enable-chromecast \
-    --enable-itunes \
     --enable-lastfm \
     --enable-mpd \
     --host=$CHOST \
@@ -92,7 +70,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.17
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
 
 # set version label
 ARG BUILD_DATE
@@ -107,6 +85,7 @@ RUN \
     confuse \
     dbus \
     ffmpeg \
+    gnutls \
     json-c \
     libevent \
     libgcrypt \
@@ -125,7 +104,6 @@ RUN \
 
 # copy buildstage and local files
 COPY --from=buildstage /tmp/daapd-build/ /
-COPY --from=buildstage /tmp/antlr3c-build/ /
 COPY root/ /
 
 # ports and volumes