From ae9a73099417ff1b159010ad191bfb1e53305deb Mon Sep 17 00:00:00 2001 From: aptalca Date: Sun, 12 Sep 2021 23:43:17 -0400 Subject: [PATCH] rebase to 3.14, add more wheel indices --- Dockerfile | 8 +++++--- Dockerfile.aarch64 | 8 +++++--- Dockerfile.armhf | 8 +++++--- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 1 + readme-vars.yml | 1 + 7 files changed, 19 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9feafe1..541329d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.13 +FROM ghcr.io/linuxserver/baseimage-alpine:3.14 # set version label ARG BUILD_DATE @@ -9,7 +9,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="saarg, roxedus" # environment settings -ENV PIPFLAGS="--no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ --find-links https://wheels.home-assistant.io/alpine-3.13/amd64/" PYTHONPATH="${PYTHONPATH}:/pip-packages" +ENV PIPFLAGS="--no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ --find-links https://wheels.home-assistant.io/alpine-3.14/amd64/ --find-links https://wheels.home-assistant.io/alpine-3.13/amd64/ --find-links https://wheels.home-assistant.io/alpine-3.13/amd64/" PYTHONPATH="${PYTHONPATH}:/pip-packages" # copy local files COPY root/ / @@ -22,6 +22,7 @@ RUN \ apk add --no-cache --virtual=build-dependencies \ autoconf \ ca-certificates \ + cargo \ cmake \ eudev-dev \ ffmpeg-dev \ @@ -90,7 +91,8 @@ RUN \ build-dependencies && \ rm -rf \ /tmp/* \ - /root/.cache + /root/.cache \ + /root/.cargo # environment settings. used so pip packages installed by home assistant installs in /config ENV HOME="/config" diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 76e7e53..c36784c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.14 # set version label ARG BUILD_DATE @@ -9,7 +9,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="saarg, roxedus" # environment settings -ENV PIPFLAGS="--no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ --find-links https://wheels.home-assistant.io/alpine-3.13/aarch64/" PYTHONPATH="${PYTHONPATH}:/pip-packages" +ENV PIPFLAGS="--no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ --find-links https://wheels.home-assistant.io/alpine-3.14/aarch64/ --find-links https://wheels.home-assistant.io/alpine-3.13/aarch64/ --find-links https://wheels.home-assistant.io/alpine-3.12/aarch64/" PYTHONPATH="${PYTHONPATH}:/pip-packages" # copy local files COPY root/ / @@ -22,6 +22,7 @@ RUN \ apk add --no-cache --virtual=build-dependencies \ autoconf \ ca-certificates \ + cargo \ cmake \ eudev-dev \ ffmpeg-dev \ @@ -89,7 +90,8 @@ RUN \ build-dependencies && \ rm -rf \ /tmp/* \ - /root/.cache + /root/.cache \ + /root/.cargo # environment settings. used so pip packages installed by home assistant installs in /config ENV HOME="/config" diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7b3f17e..f4bde9f 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.14 # set version label ARG BUILD_DATE @@ -9,7 +9,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="saarg, roxedus" # environment settings -ENV PIPFLAGS="--no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ --find-links https://wheels.home-assistant.io/alpine-3.13/armhf/" PYTHONPATH="${PYTHONPATH}:/pip-packages" +ENV PIPFLAGS="--no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ --find-links https://wheels.home-assistant.io/alpine-3.14/armhf/ --find-links https://wheels.home-assistant.io/alpine-3.13/armhf/ --find-links https://wheels.home-assistant.io/alpine-3.12/armhf/" PYTHONPATH="${PYTHONPATH}:/pip-packages" # copy local files COPY root/ / @@ -22,6 +22,7 @@ RUN \ apk add --no-cache --virtual=build-dependencies \ autoconf \ ca-certificates \ + cargo \ cmake \ eudev-dev \ ffmpeg-dev \ @@ -89,7 +90,8 @@ RUN \ build-dependencies && \ rm -rf \ /tmp/* \ - /root/.cache + /root/.cache \ + /root/.cargo # environment settings. used so pip packages installed by home assistant installs in /config ENV HOME="/config" diff --git a/Jenkinsfile b/Jenkinsfile index 5566c7f..6d818d3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -432,7 +432,7 @@ pipeline { } stage('Build ARMHF') { agent { - label 'ARMHF' + label 'ARMHF-NATIVE' } steps { echo "Running on node: ${NODE_NAME}" diff --git a/README.md b/README.md index f441a67..8650f40 100644 --- a/README.md +++ b/README.md @@ -237,6 +237,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **12.09.21:** - Rebase to alpine 3.14. Build on native armhf. * **09.08.21:** - Fixed broken build caused by missing dependency. * **01.07.21:** - Remove HACS dependencies as it caused a crash in Home-assistant. * **25.02.21:** - Add python dependencies from homeassistant base image. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 3270ad8..158b888 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,6 +6,7 @@ external_type: pip_version release_type: stable release_tag: latest ls_branch: main +armhf_native: true repo_vars: - EXT_RELEASE_TYPE = 'pip_version' - EXT_PIP = 'homeassistant' diff --git a/readme-vars.yml b/readme-vars.yml index f990a22..0a2893a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -58,6 +58,7 @@ app_setup_block: | # changelog changelogs: + - { date: "12.09.21:", desc: "Rebase to alpine 3.14. Build on native armhf." } - { date: "09.08.21:", desc: "Fixed broken build caused by missing dependency." } - { date: "01.07.21:", desc: "Remove HACS dependencies as it caused a crash in Home-assistant." } - { date: "25.02.21:", desc: "Add python dependencies from homeassistant base image." }