Merge pull request #43 from linuxserver/wheel

upate formatting, add lsio wheel index
This commit is contained in:
aptalca 2021-05-14 23:47:23 -04:00 committed by GitHub
commit b7df0c4e08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 92 additions and 90 deletions

View File

@ -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/ /

View File

@ -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/ /

View File

@ -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/ /

View File

@ -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.

View File

@ -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." }