From cae7ae977c2376a353f092da8bf96d71ec2c431e Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 14 May 2021 23:23:21 -0400 Subject: [PATCH] upate formatting, add lsio wheel index --- Dockerfile | 60 +++++++++++++++++++++++----------------------- Dockerfile.aarch64 | 60 +++++++++++++++++++++++----------------------- Dockerfile.armhf | 60 +++++++++++++++++++++++----------------------- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 92 insertions(+), 90 deletions(-) diff --git a/Dockerfile b/Dockerfile index 389bcba..14299be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,36 +8,36 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="aptalca" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - build-base \ - cargo \ - libffi-dev \ - openldap-dev \ - python3-dev && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache \ - libffi \ - libldap \ - py3-pip \ - python3 && \ - if [ -z ${LDAP_VERSION+x} ]; then \ - LDAP_INSTALL="python-ldap"; \ - else \ - LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \ - fi && \ - pip3 install -U --no-cache-dir \ - pip && \ - pip install -U \ - cryptography \ - ${LDAP_INSTALL} && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /tmp/* \ - /root/.cache \ - /root/.cargo + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + build-base \ + cargo \ + libffi-dev \ + openldap-dev \ + python3-dev && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + libffi \ + libldap \ + py3-pip \ + python3 && \ + if [ -z ${LDAP_VERSION+x} ]; then \ + LDAP_INSTALL="python-ldap"; \ + else \ + LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \ + fi && \ + pip3 install -U --no-cache-dir \ + pip && \ + pip install -U --find-links https://wheel-index.linuxserver.io/alpine/ \ + cryptography \ + ${LDAP_INSTALL} && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /tmp/* \ + /root/.cache \ + /root/.cargo # copy local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e806713..333e855 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -8,36 +8,36 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="aptalca" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - build-base \ - cargo \ - libffi-dev \ - openldap-dev \ - python3-dev && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache \ - libffi \ - libldap \ - py3-pip \ - python3 && \ - if [ -z ${LDAP_VERSION+x} ]; then \ - LDAP_INSTALL="python-ldap"; \ - else \ - LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \ - fi && \ - pip3 install -U --no-cache-dir \ - pip && \ - pip install -U \ - cryptography \ - ${LDAP_INSTALL} && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /tmp/* \ - /root/.cache \ - /root/.cargo + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + build-base \ + cargo \ + libffi-dev \ + openldap-dev \ + python3-dev && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + libffi \ + libldap \ + py3-pip \ + python3 && \ + if [ -z ${LDAP_VERSION+x} ]; then \ + LDAP_INSTALL="python-ldap"; \ + else \ + LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \ + fi && \ + pip3 install -U --no-cache-dir \ + pip && \ + pip install -U --find-links https://wheel-index.linuxserver.io/alpine/ \ + cryptography \ + ${LDAP_INSTALL} && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /tmp/* \ + /root/.cache \ + /root/.cargo # copy local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c794b75..46d7c92 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -8,36 +8,36 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="aptalca" RUN \ - echo "**** install build packages ****" && \ - apk add --no-cache --virtual=build-dependencies \ - build-base \ - cargo \ - libffi-dev \ - openldap-dev \ - python3-dev && \ - echo "**** install runtime packages ****" && \ - apk add --no-cache \ - libffi \ - libldap \ - py3-pip \ - python3 && \ - if [ -z ${LDAP_VERSION+x} ]; then \ - LDAP_INSTALL="python-ldap"; \ - else \ - LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \ - fi && \ - pip3 install -U --no-cache-dir \ - pip && \ - pip install -U \ - cryptography \ - ${LDAP_INSTALL} && \ - echo "**** cleanup ****" && \ - apk del --purge \ - build-dependencies && \ - rm -rf \ - /tmp/* \ - /root/.cache \ - /root/.cargo + echo "**** install build packages ****" && \ + apk add --no-cache --virtual=build-dependencies \ + build-base \ + cargo \ + libffi-dev \ + openldap-dev \ + python3-dev && \ + echo "**** install runtime packages ****" && \ + apk add --no-cache \ + libffi \ + libldap \ + py3-pip \ + python3 && \ + if [ -z ${LDAP_VERSION+x} ]; then \ + LDAP_INSTALL="python-ldap"; \ + else \ + LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \ + fi && \ + pip3 install -U --no-cache-dir \ + pip && \ + pip install -U --find-links https://wheel-index.linuxserver.io/alpine/ \ + cryptography \ + ${LDAP_INSTALL} && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /tmp/* \ + /root/.cache \ + /root/.cargo # copy local files COPY root/ / diff --git a/README.md b/README.md index 86f974d..b0443e9 100644 --- a/README.md +++ b/README.md @@ -214,6 +214,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **14.05.21:** - Add linuxserver wheel index. * **12.02.21:** - Clean up cargo/rust cache. * **10.02.21:** - Rebasing to alpine 3.13. * **08.09.20:** - Set form action correctly. diff --git a/readme-vars.yml b/readme-vars.yml index 5d1a561..175ae23 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -43,6 +43,7 @@ app_setup_block: | # changelog changelogs: + - { date: "14.05.21:", desc: "Add linuxserver wheel index." } - { date: "12.02.21:", desc: "Clean up cargo/rust cache." } - { date: "10.02.21:", desc: "Rebasing to alpine 3.13." } - { date: "08.09.20:", desc: "Set form action correctly." }