Skip to content

Commit c9a229c

Browse files
committed
bump to alpine 3.20
1 parent 34683f7 commit c9a229c

File tree

4 files changed

+9
-14
lines changed

4 files changed

+9
-14
lines changed

.github/workflows/build-pr-image.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,3 @@ jobs:
8080
image.args.PULL_REQUEST_RELEASE=${{ steps.gen_meta.outputs.pr_version }}
8181
targets: all
8282
push: true
83-
- name: Push to Scarf
84-
id: push_scarf
85-
run: |
86-
PACKAGE_UUID=$(curl -s -H "Authorization: Bearer ${{ secrets.scarf_token }}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="${{ github.repository_owner }}/prarr") | .uuid')
87-
if [ -z "${PACKAGE_UUID}" ]; then
88-
echo "Adding package to Scarf.sh"
89-
curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages -H "Authorization: Bearer ${{ secrets.scarf_token }}" -H "Content-Type: application/json" \
90-
-d '{"name":"${{ github.repository_owner }}/prarr","shortDescription":"example description","libraryType":"docker","website":"https://github.com/${{ github.repository_owner }}/prarr","backendUrl":"https://ghcr.io/${{ github.repository_owner }}/prarr","publicUrl":"https://lscr.io/${{ github.repository_owner }}/prarr"}'
91-
else
92-
echo "Package already exists on Scarf.sh"
93-
fi

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ RUN \
3131
/tmp/app.tar.gz -C \
3232
/app/${APP}/bin --strip-components=1 && \
3333
echo -e "UpdateMethod=docker\nBranch=${PULL_REQUEST_BRANCH}\nPackageVersion=${PULL_REQUEST_RELEASE}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > "/app/${APP}/package_info" && \
34+
printf "Linuxserver.io LABS \nPRARR app: ${APP}\nBranch: ${PULL_REQUEST_BRANCH}\nVersion: ${PULL_REQUEST_RELEASE}\nBuild-date: ${BUILD_DATE}" > /build_version && \
3435
/bin/bash -c " \
3536
printf \"\$(cat /etc/s6-overlay/s6-rc.d/svc-prarr/run)\" \${APP} \${APP} \${APP^} > /etc/s6-overlay/s6-rc.d/svc-prarr/run && \
3637
printf \"\$(cat /etc/s6-overlay/s6-rc.d/svc-prarr/data/check)\" \${EXPOSE_PORT} > /etc/s6-overlay/s6-rc.d/svc-prarr/data/check && \

Dockerfile.base

Lines changed: 3 additions & 2 deletions
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.17
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.20
44

55
# set version label
66
ARG BUILD_DATE
@@ -14,7 +14,8 @@ RUN \
1414
echo "**** install packages ****" && \
1515
apk add -U --upgrade --no-cache \
1616
icu-libs \
17-
sqlite-libs
17+
sqlite-libs \
18+
xmlstarlet
1819

1920
# copy local files
2021
COPY root/ /

root/etc/s6-overlay/s6-rc.d/svc-prarr/data/check

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#!/bin/bash
22

3-
if [[ $(curl -sL "http://localhost:%s/ping" | jq -r '.status' 2>/dev/null) = "OK" ]]; then
3+
if [[ -f /config/config.xml ]]; then
4+
PORT=$(xmlstarlet sel -T -t -v /Config/Port /config/config.xml)
5+
fi
6+
7+
if [[ $(curl -sL "http://localhost:${PORT:-%s}/ping" | jq -r '.status' 2>/dev/null) = "OK" ]]; then
48
exit 0
59
else
610
exit 1

0 commit comments

Comments
 (0)