Skip to content

Commit f2c83a8

Browse files
authored
Merge pull request #7 from linuxserver/runfix
add deps to get image running again, note head is broken
2 parents 665b872 + 9323a65 commit f2c83a8

File tree

7 files changed

+24
-25
lines changed

7 files changed

+24
-25
lines changed

.github/workflows/external_trigger.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
3030
echo "> External trigger running off of master branch. To disable this trigger, add \`xemu_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
3131
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
32-
EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/xemu-project/xemu/releases/latest" | jq -r '. | .tag_name')
33-
echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY
32+
EXT_RELEASE=$(echo v0.8.133)
33+
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
3434
if grep -q "^xemu_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
3535
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
3636
echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
1010
LABEL maintainer="thelamer"
1111

1212
# title
13-
ENV TITLE=xemu
13+
ENV TITLE=xemu \
14+
PIXELFLUX_WAYLAND=true
1415

1516
RUN \
1617
echo "**** add icon ****" && \
@@ -21,12 +22,13 @@ RUN \
2122
apt-get update && \
2223
apt-get install -y --no-install-recommends \
2324
libgtk-3-common \
25+
libpipewire-0.3 \
2426
libusb-1.0-0 && \
2527
DOWNLOAD_URL=$(curl -sX GET "https://api.github.com/repos/xemu-project/xemu/releases/latest" \
2628
| awk -F '(": "|")' '/browser.*x86_64.AppImage/ && !/.*dbg.*/ {print $3}') && \
2729
curl -o \
2830
/tmp/xemu.app -L \
29-
"${DOWNLOAD_URL}" && \
31+
"https://github.com/xemu-project/xemu/releases/download/v0.8.133/xemu-0.8.133-x86_64.AppImage" && \
3032
cd /tmp && \
3133
chmod +x xemu.app && \
3234
./xemu.app --appimage-extract && \

Dockerfile.aarch64

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
1010
LABEL maintainer="thelamer"
1111

1212
# title
13-
ENV TITLE=xemu
13+
ENV TITLE=xemu \
14+
PIXELFLUX_WAYLAND=true
1415

1516
RUN \
1617
echo "**** add icon ****" && \
@@ -26,7 +27,7 @@ RUN \
2627
| awk -F '(": "|")' '/browser.*aarch64.AppImage/ && !/.*dbg.*/ {print $3}') && \
2728
curl -o \
2829
/tmp/xemu.app -L \
29-
"${DOWNLOAD_URL}" && \
30+
"https://github.com/xemu-project/xemu/releases/download/v0.8.133/xemu-0.8.133-aarch64.AppImage" && \
3031
cd /tmp && \
3132
chmod +x xemu.app && \
3233
./xemu.app --appimage-extract && \

Jenkinsfile

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -145,23 +145,16 @@ pipeline {
145145
/* ########################
146146
External Release Tagging
147147
######################## */
148-
// If this is a stable github release use the latest endpoint from github to determine the ext tag
149-
stage("Set ENV github_stable"){
150-
steps{
151-
script{
152-
env.EXT_RELEASE = sh(
153-
script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''',
154-
returnStdout: true).trim()
155-
}
156-
}
157-
}
158-
// If this is a stable or devel github release generate the link for the build message
159-
stage("Set ENV github_link"){
160-
steps{
161-
script{
162-
env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE
163-
}
164-
}
148+
// If this is a custom command to determine version use that command
149+
stage("Set tag custom bash"){
150+
steps{
151+
script{
152+
env.EXT_RELEASE = sh(
153+
script: ''' echo v0.8.133 ''',
154+
returnStdout: true).trim()
155+
env.RELEASE_LINK = 'custom_command'
156+
}
157+
}
165158
}
166159
// Sanitize the release tag and strip illegal docker or github characters
167160
stage("Sanitize tag"){
@@ -1030,7 +1023,7 @@ pipeline {
10301023
"type": "commit",\
10311024
"tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}'
10321025
echo "Pushing New release for Tag"
1033-
curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. |.body' > releasebody.json
1026+
echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
10341027
jq -n \
10351028
--arg tag_name "$META_TAG" \
10361029
--arg target_commitish "master" \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
612612

613613
## Versions
614614

615+
* **20.12.25:** - Add libpipewire dep for appimage, pin to v0.8.133.
615616
* **20.12.25:** - Add libusb dep for appimage.
616617
* **20.12.25:** - Add Wayland init logic.
617618
* **07.07.25:** - Install GTK libs for file chooser.

jenkins-vars.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
# jenkins variables
44
project_name: docker-xemu
5-
external_type: github_stable
5+
external_type: na
6+
custom_version_command: "echo v0.8.133"
67
release_type: stable
78
release_tag: latest
89
ls_branch: master

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ init_diagram: |
107107
"xemu:latest" <- Base Images
108108
# changelog
109109
changelogs:
110+
- {date: "20.12.25:", desc: "Add libpipewire dep for appimage, pin to v0.8.133."}
110111
- {date: "20.12.25:", desc: "Add libusb dep for appimage."}
111112
- {date: "20.12.25:", desc: "Add Wayland init logic."}
112113
- {date: "07.07.25:", desc: "Install GTK libs for file chooser."}

0 commit comments

Comments
 (0)