Skip to content

Commit 61e5d10

Browse files
committed
Get dynamic version
1 parent 1879757 commit 61e5d10

6 files changed

Lines changed: 18 additions & 9 deletions

File tree

.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
2424
echo "> External trigger running off of master branch. To disable this trigger, add \`qemu-static_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
2525
printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
26-
EXT_RELEASE=$(echo 9.1.2+ds-1~bpo12+1)
26+
EXT_RELEASE=$(curl -sX GET https://deb.debian.org/debian/dists/bookworm-backports/main/binary-amd64/Packages.xz | xz -dc |grep -A 7 -m 2 'Package: qemu-user$' | awk -F ': ' '/Version/{print $2;exit}')
2727
echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY
2828
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
2929
echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY

Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,27 @@
22

33
FROM debian:bookworm AS buildstage
44

5-
ARG QEMU_VERSION="9.1.2+ds-1~bpo12+1"
5+
ARG QEMU_VERSION
66

77
RUN \
88
echo "**** install build deps ****" && \
99
apt-get update && \
1010
apt-get install -y \
11-
curl
11+
curl \
12+
xz-utils
1213

1314
RUN \
1415
echo "**** ingest external assets ****" && \
1516
mkdir -p \
1617
/build-out/qemu \
1718
/build-out/usr/bin \
1819
/tmp/qemu && \
20+
if [ -z "${QEMU_VERSION}" ]; then \
21+
QEMU_VERSION=$(curl -sX GET https://deb.debian.org/debian/dists/bookworm-backports/main/binary-amd64/Packages.xz | xz -dc |grep -A 7 -m 2 'Package: qemu-user$' | awk -F ': ' '/Version/{print $2;exit}'); \
22+
fi && \
1923
curl -o \
2024
/tmp/qemu.deb -L \
21-
"http://ftp.de.debian.org/debian/pool/main/q/qemu/qemu-user_${QEMU_VERSION}_amd64.deb" && \
25+
"http://deb.debian.org/debian/pool/main/q/qemu/qemu-user_${QEMU_VERSION}_amd64.deb" && \
2226
cd /tmp && \
2327
dpkg-deb -R \
2428
qemu.deb \

Dockerfile.aarch64

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,27 @@
22

33
FROM debian:bookworm AS buildstage
44

5-
ARG QEMU_VERSION="9.1.2+ds-1~bpo12+1"
5+
ARG QEMU_VERSION
66

77
RUN \
88
echo "**** install build deps ****" && \
99
apt-get update && \
1010
apt-get install -y \
11-
curl
11+
curl \
12+
xz-utils
1213

1314
RUN \
1415
echo "**** ingest external assets ****" && \
1516
mkdir -p \
1617
/build-out/qemu \
1718
/build-out/usr/bin \
1819
/tmp/qemu && \
20+
if [ -z "${QEMU_VERSION}" ]; then \
21+
QEMU_VERSION=$(curl -sX GET https://deb.debian.org/debian/dists/bookworm-backports/main/binary-amd64/Packages.xz | xz -dc |grep -A 7 -m 2 'Package: qemu-user$' | awk -F ': ' '/Version/{print $2;exit}'); \
22+
fi && \
1923
curl -o \
2024
/tmp/qemu.deb -L \
21-
"http://ftp.de.debian.org/debian/pool/main/q/qemu/qemu-user_${QEMU_VERSION}_arm64.deb" && \
25+
"http://deb.debian.org/debian/pool/main/q/qemu/qemu-user_${QEMU_VERSION}_arm64.deb" && \
2226
cd /tmp && \
2327
dpkg-deb -R \
2428
qemu.deb \

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ pipeline {
124124
steps{
125125
script{
126126
env.EXT_RELEASE = sh(
127-
script: ''' echo 9.1.2+ds-1~bpo12+1 ''',
127+
script: ''' curl -sX GET https://deb.debian.org/debian/dists/bookworm-backports/main/binary-amd64/Packages.xz | xz -dc |grep -A 7 -m 2 'Package: qemu-user$' | awk -F ': ' '/Version/{print $2;exit}' ''',
128128
returnStdout: true).trim()
129129
env.RELEASE_LINK = 'custom_command'
130130
}

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,6 @@ docker run --rm -it \
6767
```
6868
## Versions
6969

70+
* **09.12.24:** - Upgrade to 9.1.2.
7071
* **07.11.24:** - Upgrade to 9.1.1, switch to new debian package and bin naming scheme.
7172
* **14.10.24:** - Initial release.

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# jenkins variables
44
project_name: docker-qemu-static
55
external_type: na
6-
custom_version_command: "echo 9.1.2+ds-1~bpo12+1"
6+
custom_version_command: "curl -sX GET https://deb.debian.org/debian/dists/bookworm-backports/main/binary-amd64/Packages.xz | xz -dc |grep -A 7 -m 2 'Package: qemu-user$' | awk -F ': ' '/Version/{print $2;exit}'"
77
release_type: stable
88
release_tag: latest
99
ls_branch: master

0 commit comments

Comments
 (0)