Skip to content

Commit b98d4b0

Browse files
authored
Merge pull request #1023 from linuxserver/jellyfin-opencl-intel-artifact-fix
revert legacy version bump, improve release artifact retrieval
2 parents 6deb5b9 + ace03ec commit b98d4b0

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

Dockerfile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# syntax=docker/dockerfile:1
22

33
## Buildstage ##
4-
FROM ghcr.io/linuxserver/baseimage-alpine:3.19 as buildstage
4+
FROM ghcr.io/linuxserver/baseimage-alpine:3.21 as buildstage
55

66
ARG MOD_VERSION
77

88
RUN \
99
echo "**** install packages ****" && \
1010
if [ -z "${MOD_VERSION}" ]; then \
11-
MOD_VERSION=$(curl -sX GET "https://api.github.com/repos/intel/compute-runtime/releases/latest" | jq -r '.tag_name'); \
11+
MOD_VERSION=$(curl -sfX GET "https://api.github.com/repos/intel/compute-runtime/releases/latest" | jq -r '.tag_name'); \
1212
fi && \
13-
COMP_RT_URLS_LEGACY1=$(curl -sX GET "https://api.github.com/repos/intel/compute-runtime/releases/tags/24.35.30872.32" | jq -r '.body' | grep wget | grep -v .sum | grep -v .ddeb | sed 's|wget ||g') && \
13+
COMP_RT_URLS_LEGACY1=$(curl -sfX GET "https://api.github.com/repos/intel/compute-runtime/releases/tags/24.35.30872.22" | jq -r '.body' | grep wget | grep -v .sum | grep -v .ddeb | sed 's|wget ||g') && \
1414
echo "**** grab legacy1 debs ****" && \
1515
mkdir -p /root-layer/opencl-intel-legacy1 && \
1616
for i in $COMP_RT_URLS_LEGACY1; do \
@@ -19,7 +19,13 @@ RUN \
1919
/root-layer/opencl-intel-legacy1/$(basename "${i%$'\r'}") -L \
2020
"${i%$'\r'}" || exit 1; \
2121
done && \
22-
COMP_RT_URLS=$(curl -sX GET "https://api.github.com/repos/intel/compute-runtime/releases/tags/${MOD_VERSION}" | jq -r '.body' | grep wget | grep -v .sum | grep -v .ddeb | sed 's|wget ||g') && \
22+
COMP_RT_URLS=$(curl -sfX GET "https://api.github.com/repos/intel/compute-runtime/releases/tags/${MOD_VERSION}" | jq -r '.body' | grep wget | grep -v .sum | grep -v .ddeb | sed 's|wget ||g') && \
23+
if [ -z "${COMP_RT_URLS}" ]; then \
24+
echo "**** No download URLs found in release, checking artifacts ****"; \
25+
COMP_RT_URLS=$(curl -sfX GET "https://api.github.com/repos/intel/compute-runtime/releases/tags/${MOD_VERSION}" | jq -r '.assets[].browser_download_url' | grep -v .sum | grep -v .ddeb); \
26+
IGC_VERSION=$(curl -sfX GET "https://api.github.com/repos/intel/intel-graphics-compiler/releases/latest" | jq -r '.tag_name'); \
27+
COMP_RT_URLS="${COMP_RT_URLS} $(curl -sfX GET https://api.github.com/repos/intel/intel-graphics-compiler/releases/tags/${IGC_VERSION} | jq -r '.assets[].browser_download_url' | grep -v devel)"; \
28+
fi && \
2329
echo "**** grab latest debs ****" && \
2430
mkdir -p /root-layer/opencl-intel && \
2531
for i in $COMP_RT_URLS; do \

0 commit comments

Comments
 (0)