Skip to content

Commit b6bc231

Browse files
committed
test multi arch
1 parent df4bfff commit b6bc231

6 files changed

Lines changed: 60 additions & 5 deletions

File tree

.github/workflows/external_trigger.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,15 @@ jobs:
4343
token=$(curl -sX GET \
4444
"https://ghcr.io/token?scope=repository%3Alinuxserver%2Fqemu-static%3Apull" \
4545
| jq -r '.token')
46-
digest=$(curl -s \
46+
multidigest=$(curl -s \
4747
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
4848
--header "Authorization: Bearer ${token}" \
4949
"https://ghcr.io/v2/${image}/manifests/${tag}" \
50+
| jq -r 'first(.manifests[].digest)')
51+
digest=$(curl -s \
52+
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
53+
--header "Authorization: Bearer ${token}" \
54+
"https://ghcr.io/v2/${image}/manifests/${multidigest}" \
5055
| jq -r '.config.digest')
5156
image_info=$(curl -sL \
5257
--header "Authorization: Bearer ${token}" \

Dockerfile.aarch64

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# syntax=docker/dockerfile:1
2+
3+
FROM debian:bookworm AS buildstage
4+
5+
ARG QEMU_VERSION="9.0.2+ds-1~bpo12+1"
6+
7+
RUN \
8+
echo "**** install build deps ****" && \
9+
apt-get update && \
10+
apt-get install -y \
11+
curl
12+
13+
RUN \
14+
echo "**** ingest external assets ****" && \
15+
mkdir -p \
16+
/build-out/qemu \
17+
/build-out/usr/bin \
18+
/tmp/qemu && \
19+
curl -o \
20+
/tmp/qemu.deb -L \
21+
"http://ftp.de.debian.org/debian/pool/main/q/qemu/qemu-user-static_${QEMU_VERSION}_arm64.deb" && \
22+
cd /tmp && \
23+
dpkg-deb -R \
24+
qemu.deb \
25+
/tmp/qemu && \
26+
cp \
27+
/tmp/qemu/usr/bin/* \
28+
/build-out/qemu && \
29+
curl -o \
30+
/build-out/usr/bin/qemu-binfmt-conf -L \
31+
"https://raw.githubusercontent.com/qemu/qemu/refs/heads/master/scripts/qemu-binfmt-conf.sh" && \
32+
chmod +x /build-out/usr/bin/qemu-binfmt-conf
33+
34+
# runtime stage
35+
FROM alpine:latest
36+
37+
# set version label
38+
ARG BUILD_DATE
39+
ARG VERSION
40+
ARG QEMU_VERSION
41+
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
42+
LABEL maintainer="thelamer"
43+
44+
# Add build assets
45+
COPY --from=buildstage /build-out/ /
46+
47+
# add local files
48+
COPY /root /
49+
50+
ENTRYPOINT ["/register"]

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pipeline {
2727
DEV_DOCKERHUB_IMAGE = 'lsiodev/qemu-static'
2828
PR_DOCKERHUB_IMAGE = 'lspipepr/qemu-static'
2929
DIST_IMAGE = 'alpine'
30-
MULTIARCH='false'
30+
MULTIARCH='true'
3131
CI='false'
3232
}
3333
stages {

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ The architectures supported by this image are:
4949
| Architecture | Available | Tag |
5050
| :----: | :----: | ---- |
5151
| x86-64 || amd64-\<version tag\> |
52-
| arm64 | | arm64v8-\<version tag\> |
52+
| arm64 | | arm64v8-\<version tag\> |
5353
| armhf|| arm32v7-\<version tag\> |
5454

5555
## Usage

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ repo_vars:
1717
- DEV_DOCKERHUB_IMAGE = 'lsiodev/qemu-static'
1818
- PR_DOCKERHUB_IMAGE = 'lspipepr/qemu-static'
1919
- DIST_IMAGE = 'alpine'
20-
- MULTIARCH='false'
20+
- MULTIARCH='true'
2121
- CI='false'

readme-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ full_custom_readme: |
5353
| Architecture | Available | Tag |
5454
| :----: | :----: | ---- |
5555
| x86-64 | ✅ | amd64-\<version tag\> |
56-
| arm64 | | arm64v8-\<version tag\> |
56+
| arm64 | | arm64v8-\<version tag\> |
5757
| armhf| ❌ | arm32v7-\<version tag\> |
5858
5959
## Usage

0 commit comments

Comments
 (0)