From 8686878f91b319f49f4afb8aac4a01859bf3384c Mon Sep 17 00:00:00 2001 From: Roxedus Date: Sat, 8 May 2021 15:14:38 +0200 Subject: [PATCH] Fix build, style changes. --- Dockerfile | 80 ++++++++++++++--------------- Dockerfile.aarch64 | 80 ++++++++++++++--------------- Dockerfile.armhf | 80 ++++++++++++++--------------- README.md | 1 + readme-vars.yml | 1 + root/etc/services.d/htpcmanager/run | 1 + 6 files changed, 123 insertions(+), 120 deletions(-) diff --git a/Dockerfile b/Dockerfile index dc9d010..906b0be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,46 +7,46 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="notdriz" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - autoconf \ - automake \ - cargo \ - freetype-dev \ - g++ \ - gcc \ - jpeg-dev \ - lcms2-dev \ - libffi-dev \ - libpng-dev \ - libwebp-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - openjpeg-dev \ - openssl-dev \ - python3-dev \ - tiff-dev \ - zlib-dev && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache \ - python3 \ - py3-pip \ - git \ - vnstat \ - jq && \ - echo "**** install app ****" && \ - git clone --depth 1 https://github.com/HTPC-Manager/HTPC-Manager.git /app/htpcmanager && \ - echo "**** install pip packages ****" && \ - sed -i -e '/psutil\|pyopenssl\|pySMART/d' /app/htpcmanager/requirements.txt && \ - pip install --no-cache-dir -U -r /app/htpcmanager/requirements.txt && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /root/.cache \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + autoconf \ + automake \ + cargo \ + freetype-dev \ + g++ \ + gcc \ + jpeg-dev \ + lcms2-dev \ + libffi-dev \ + libpng-dev \ + libwebp-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + openjpeg-dev \ + openssl-dev \ + python3-dev \ + tiff-dev \ + zlib-dev && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + git \ + jq \ + py3-pip \ + python3 \ + vnstat && \ + echo "**** install app ****" && \ + git clone --depth 1 https://github.com/HTPC-Manager/HTPC-Manager.git /app/htpcmanager && \ + echo "**** install pip packages ****" && \ + sed -i -e '/psutil\|pyopenssl\|pySMART/d' /app/htpcmanager/requirements.txt && \ + pip install --ignore-installed --no-cache-dir -U -r /app/htpcmanager/requirements.txt && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /root/.cache \ + /tmp/* # add local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d98a924..a8904ce 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -7,46 +7,46 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="notdriz" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - autoconf \ - automake \ - cargo \ - freetype-dev \ - g++ \ - gcc \ - jpeg-dev \ - lcms2-dev \ - libffi-dev \ - libpng-dev \ - libwebp-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - openjpeg-dev \ - openssl-dev \ - python3-dev \ - tiff-dev \ - zlib-dev && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache \ - python3 \ - py3-pip \ - git \ - vnstat \ - jq && \ - echo "**** install app ****" && \ - git clone --depth 1 https://github.com/HTPC-Manager/HTPC-Manager.git /app/htpcmanager && \ - echo "**** install pip packages ****" && \ - sed -i -e '/psutil\|pyopenssl\|pySMART/d' /app/htpcmanager/requirements.txt && \ - pip install --no-cache-dir -U -r /app/htpcmanager/requirements.txt && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /root/.cache \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + autoconf \ + automake \ + cargo \ + freetype-dev \ + g++ \ + gcc \ + jpeg-dev \ + lcms2-dev \ + libffi-dev \ + libpng-dev \ + libwebp-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + openjpeg-dev \ + openssl-dev \ + python3-dev \ + tiff-dev \ + zlib-dev && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + git \ + jq \ + py3-pip \ + python3 \ + vnstat && \ + echo "**** install app ****" && \ + git clone --depth 1 https://github.com/HTPC-Manager/HTPC-Manager.git /app/htpcmanager && \ + echo "**** install pip packages ****" && \ + sed -i -e '/psutil\|pyopenssl\|pySMART/d' /app/htpcmanager/requirements.txt && \ + pip install --ignore-installed --no-cache-dir -U -r /app/htpcmanager/requirements.txt && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /root/.cache \ + /tmp/* # add local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 8e7706f..936be3e 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -7,46 +7,46 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="notdriz" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - autoconf \ - automake \ - cargo \ - freetype-dev \ - g++ \ - gcc \ - jpeg-dev \ - lcms2-dev \ - libffi-dev \ - libpng-dev \ - libwebp-dev \ - libxml2-dev \ - libxslt-dev \ - linux-headers \ - make \ - openjpeg-dev \ - openssl-dev \ - python3-dev \ - tiff-dev \ - zlib-dev && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache \ - python3 \ - py3-pip \ - git \ - vnstat \ - jq && \ - echo "**** install app ****" && \ - git clone --depth 1 https://github.com/HTPC-Manager/HTPC-Manager.git /app/htpcmanager && \ - echo "**** install pip packages ****" && \ - sed -i -e '/psutil\|pyopenssl\|pySMART/d' /app/htpcmanager/requirements.txt && \ - pip install --no-cache-dir -U -r /app/htpcmanager/requirements.txt && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /root/.cache \ - /tmp/* + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + autoconf \ + automake \ + cargo \ + freetype-dev \ + g++ \ + gcc \ + jpeg-dev \ + lcms2-dev \ + libffi-dev \ + libpng-dev \ + libwebp-dev \ + libxml2-dev \ + libxslt-dev \ + linux-headers \ + make \ + openjpeg-dev \ + openssl-dev \ + python3-dev \ + tiff-dev \ + zlib-dev && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + git \ + jq \ + py3-pip \ + python3 \ + vnstat && \ + echo "**** install app ****" && \ + git clone --depth 1 https://github.com/HTPC-Manager/HTPC-Manager.git /app/htpcmanager && \ + echo "**** install pip packages ****" && \ + sed -i -e '/psutil\|pyopenssl\|pySMART/d' /app/htpcmanager/requirements.txt && \ + pip install --ignore-installed --no-cache-dir -U -r /app/htpcmanager/requirements.txt && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /root/.cache \ + /tmp/* # add local files COPY root/ / diff --git a/README.md b/README.md index 2792979..6ed749a 100644 --- a/README.md +++ b/README.md @@ -222,6 +222,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **08.04.21:** - Fix build. * **10.02.21:** - Rebasing to alpine 3.13. * **26.10.20:** - Rebase to alpine 3.12, python3, change upstream project * **19.12.19:** - Rebasing to alpine 3.11. diff --git a/readme-vars.yml b/readme-vars.yml index 5fc11ab..01d88c1 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -42,6 +42,7 @@ app_setup_nginx_reverse_proxy_block: "" # changelog changelogs: + - { date: "08.04.21:", desc: "Fix build." } - { date: "10.02.21:", desc: "Rebasing to alpine 3.13." } - { date: "26.10.20:", desc: "Rebase to alpine 3.12, python3, change upstream project" } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } diff --git a/root/etc/services.d/htpcmanager/run b/root/etc/services.d/htpcmanager/run index 9833edd..a514260 100644 --- a/root/etc/services.d/htpcmanager/run +++ b/root/etc/services.d/htpcmanager/run @@ -1,4 +1,5 @@ #!/usr/bin/with-contenv bash + exec \ s6-setuidgid abc python3 /app/htpcmanager/Htpc.py \ --datadir /config