duplicate for armv8l

This commit is contained in:
aptalca 2023-04-04 14:42:25 -04:00
parent 00c842becf
commit 441e9cfc29
No known key found for this signature in database
GPG Key ID: BE36CFFB9FD85548
5 changed files with 18 additions and 9 deletions

View File

@ -117,7 +117,7 @@ RUN \
${HOME}/.cargo \
${HOME}/.cache && \
echo "**** Renaming wheels if necessary ****" && \
/bin/bash -c 'for i in $(ls /build/*armv8l*.whl 2>/dev/null); do echo "processing ${i}" && mv -- "$i" "${i//armv8l/armv7l}"; done' && \
/bin/bash -c 'for i in $(ls /build/*armv8l*.whl 2>/dev/null); do echo "processing ${i}" && cp -- "$i" "${i//armv8l/armv7l}"; done' && \
echo "**** Wheels built are: ****" && \
ls /build

View File

@ -100,4 +100,8 @@ RUN \
/var/lib/apt/lists/* \
/var/tmp/* \
${HOME}/.cargo \
${HOME}/.cache
${HOME}/.cache && \
echo "**** Renaming wheels if necessary ****" && \
/bin/bash -c 'for i in $(ls /build/*armv7l*.whl 2>/dev/null); do echo "processing ${i}" && cp -- "$i" "${i//armv7l/armv8l}"; done' && \
echo "**** Wheels built are: ****" && \
ls /build

View File

@ -28,7 +28,6 @@ RUN \
. /build-env/bin/activate && \
pip3 install -U pip setuptools wheel cython && \
mkdir -p /build && \
PIKEPDF_VERSION=$(curl -sL "https://pypi.python.org/pypi/pikepdf/json" |jq -r '. | .info.version') && \
pip wheel --wheel-dir=/build -f https://wheel-index.linuxserver.io/ubuntu/ -v ninja patchelf && \
pip install /build/ninja-* /build/patchelf-* && \
pip wheel --wheel-dir=/build -f https://wheel-index.linuxserver.io/ubuntu/ -v \
@ -55,6 +54,8 @@ RUN \
/var/tmp/* \
${HOME}/.cargo \
${HOME}/.cache && \
echo "**** Renaming wheels if necessary ****" && \
/bin/bash -c 'for i in $(ls /build/*armv8l*.whl 2>/dev/null); do echo "processing ${i}" && cp -- "$i" "${i//armv8l/armv7l}"; done' && \
echo "**** Wheels built are: ****" && \
ls /build

View File

@ -42,7 +42,7 @@ pipeline {
sh '''#! /bin/bash
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
'''
sh "docker build --no-cache --pull -t ghcr.io/linuxserver/wheelie:homeassistant-amd64 --build-arg ARCH=amd64 -f Dockerfile.homeassistant ."
sh "docker buildx build --no-cache --pull --platform=linux/amd64 -t ghcr.io/linuxserver/wheelie:homeassistant-amd64 --build-arg ARCH=amd64 -f Dockerfile.homeassistant ."
}
}
stage('Build arm32v7') {
@ -55,7 +55,7 @@ pipeline {
sh '''#! /bin/bash
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
'''
sh "docker build --no-cache --pull -t ghcr.io/linuxserver/wheelie:homeassistant-arm32v7 --build-arg ARCH=arm32v7 -f Dockerfile.homeassistant ."
sh "docker buildx build --no-cache --pull --platform=linux/arm/v7 -t ghcr.io/linuxserver/wheelie:homeassistant-arm32v7 --build-arg ARCH=arm32v7 -f Dockerfile.homeassistant ."
retry(5) {
sh "docker push ghcr.io/linuxserver/wheelie:homeassistant-arm32v7"
}
@ -73,7 +73,7 @@ pipeline {
sh '''#! /bin/bash
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
'''
sh "docker build --no-cache --pull -t ghcr.io/linuxserver/wheelie:homeassistant-arm64v8 --build-arg ARCH=arm64v8 -f Dockerfile.homeassistant ."
sh "docker buildx build --no-cache --pull --platform=linux/arm64 -t ghcr.io/linuxserver/wheelie:homeassistant-arm64v8 --build-arg ARCH=arm64v8 -f Dockerfile.homeassistant ."
retry(5) {
sh "docker push ghcr.io/linuxserver/wheelie:homeassistant-arm64v8"
}
@ -123,7 +123,7 @@ pipeline {
-v ${PWD}/build:/build \
-e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
-e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
ghcr.io/linuxserver/baseimage-alpine:3.14
ghcr.io/linuxserver/baseimage-alpine:3.16
docker exec s3cmd /bin/bash -c 'apk add --no-cache py3-pip && pip install s3cmd'
echo "pushing wheels as necessary"
os="homeassistant-3.16"

View File

@ -21,7 +21,7 @@ pipeline {
axes {
axis {
name 'MATRIXARCH'
values 'X86-64-MULTI', 'ARM64', 'ARMHF-WHEELIE-NATIVE'
values 'X86-64-MULTI', 'ARM64', 'ARMHF-WHEELIE-CHROOT'
}
axis {
name 'MATRIXDISTRO'
@ -53,13 +53,17 @@ pipeline {
sh '''#! /bin/bash
if [ "${MATRIXARCH}" == "X86-64-MULTI" ]; then
ARCH="amd64"
PLATFORM="linux/amd64"
elif [ "${MATRIXARCH}" == "ARM64" ]; then
ARCH="arm64v8"
PLATFORM="linux/arm64"
else
ARCH="arm32v7"
PLATFORM="linux/arm/v7"
fi
docker build \
docker buildx build \
--no-cache --pull -t ghcr.io/linuxserver/wheelie:sci-${ARCH}-${MATRIXDISTRO} \
--platform=${PLATFORM} \
--build-arg DISTRO=${MATRIXDISTRO} \
--build-arg ARCH=${ARCH} \
--build-arg PACKAGES=\"${PACKAGES}\" \