Merge pull request #45 from linuxserver/repo

update upstream repo

.github/workflows/external_trigger.yml

@@ -18,7 +18,7 @@ jobs:
           fi
           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_DAAPD_MASTER\". ****"
           echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/ejurgensen/forked-daapd/releases/latest" | jq -r '. | .tag_name')
+          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/owntone/forked-daapd/releases/latest" | jq -r '. | .tag_name')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "**** Can't retrieve external version, exiting ****"
             FAILURE_REASON="Can't retrieve external version for daapd branch master"

Dockerfile

@@ -69,7 +69,7 @@ RUN \
  export CFLAGS="-I/tmp/antlr3c-build/usr/include" && \
  echo "**** compile forked-daapd ****" && \
  if [ -z ${DAAPD_RELEASE+x} ]; then \
-	DAAPD_RELEASE=$(curl -sX GET "https://api.github.com/repos/ejurgensen/forked-daapd/releases/latest" \
+	DAAPD_RELEASE=$(curl -sX GET "https://api.github.com/repos/owntone/forked-daapd/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/ && \
@@ -81,7 +81,7 @@ RUN \
  export LIBSPOTIFY_LIBS="/tmp/libspotify-build/lib/libspotify.so" && \
  curl -o \
  /tmp/source/forked.tar.gz -L \
-	"https://github.com/ejurgensen/forked-daapd/archive/${DAAPD_RELEASE}.tar.gz" && \
+	"https://github.com/owntone/forked-daapd/archive/${DAAPD_RELEASE}.tar.gz" && \
  tar xf /tmp/source/forked.tar.gz -C \
 	/tmp/source/forked-daapd --strip-components=1 && \
  export PATH="/tmp/source:$PATH" && \
@@ -110,7 +110,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:3.12
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="sparklyballs"
+LABEL maintainer="BernsteinA"
 
 RUN \
  echo "**** install runtime packages ****" && \

Dockerfile.aarch64

@@ -67,12 +67,12 @@ RUN \
  export CFLAGS="-I/tmp/antlr3c-build/usr/include" && \
  echo "**** compile forked-daapd ****" && \
  if [ -z ${DAAPD_RELEASE+x} ]; then \
-	DAAPD_RELEASE=$(curl -sX GET "https://api.github.com/repos/ejurgensen/forked-daapd/releases/latest" \
+	DAAPD_RELEASE=$(curl -sX GET "https://api.github.com/repos/owntone/forked-daapd/releases/latest" \
 	| awk '/tag_name/{print $4;exit}' FS='[""]'); \
  fi && \
  curl -o \
  /tmp/source/forked.tar.gz -L \
-	"https://github.com/ejurgensen/forked-daapd/archive/${DAAPD_RELEASE}.tar.gz" && \
+	"https://github.com/owntone/forked-daapd/archive/${DAAPD_RELEASE}.tar.gz" && \
  tar xf /tmp/source/forked.tar.gz -C \
 	/tmp/source/forked-daapd --strip-components=1 && \
  export PATH="/tmp/source:$PATH" && \
@@ -101,7 +101,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.12
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="sparklyballs"
+LABEL maintainer="BernsteinA"
 
 RUN \
  echo "**** install runtime packages ****" && \

Dockerfile.armhf

@@ -69,7 +69,7 @@ RUN \
  export CFLAGS="-I/tmp/antlr3c-build/usr/include" && \
  echo "**** compile forked-daapd ****" && \
  if [ -z ${DAAPD_RELEASE+x} ]; then \
-	DAAPD_RELEASE=$(curl -sX GET "https://api.github.com/repos/ejurgensen/forked-daapd/releases/latest" \
+	DAAPD_RELEASE=$(curl -sX GET "https://api.github.com/repos/owntone/forked-daapd/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/ && \
@@ -79,7 +79,7 @@ RUN \
  rm -rf /tmp/source/libspotify && \
  curl -o \
  /tmp/source/forked.tar.gz -L \
-	"https://github.com/ejurgensen/forked-daapd/archive/${DAAPD_RELEASE}.tar.gz" && \
+	"https://github.com/owntone/forked-daapd/archive/${DAAPD_RELEASE}.tar.gz" && \
  tar xf /tmp/source/forked.tar.gz -C \
 	/tmp/source/forked-daapd --strip-components=1 && \
  export PATH="/tmp/source:$PATH" && \
@@ -108,7 +108,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.12
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="sparklyballs"
+LABEL maintainer="BernsteinA"
 
 RUN \
  echo "**** install runtime packages ****" && \

Jenkinsfile

@@ -17,7 +17,7 @@ pipeline {
     GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
     GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
     EXT_GIT_BRANCH = 'master'
-    EXT_USER = 'ejurgensen'
+    EXT_USER = 'owntone'
     EXT_REPO = 'forked-daapd'
     BUILD_VERSION_ARG = 'DAAPD_RELEASE'
     LS_USER = 'linuxserver'

README.md

@@ -224,6 +224,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **30.03.21:** - Update upstream repo.
 * **06.10.20:** - Enabled Spotify on Alpine 3.12 for X86_64 and ARMv7.
 * **01.06.20:** - Rebasing to alpine 3.12.
 * **16.01.20:** - Rebase to alpine linux 3.11 and build antlr3c from source.

jenkins-vars.yml

@@ -8,7 +8,7 @@ release_tag: latest
 ls_branch: master
 repo_vars:
   - EXT_GIT_BRANCH = 'master'
-  - EXT_USER = 'ejurgensen'
+  - EXT_USER = 'owntone'
   - EXT_REPO = 'forked-daapd'
   - BUILD_VERSION_ARG = 'DAAPD_RELEASE'
   - LS_USER = 'linuxserver'

readme-vars.yml

@@ -53,6 +53,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "30.03.21:", desc: "Update upstream repo." }
   - { date: "06.10.20:", desc: "Enabled Spotify on Alpine 3.12 for X86_64 and ARMv7." }
   - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
   - { date: "16.01.20:", desc: "Rebase to alpine linux 3.11 and build antlr3c from source." }