Skip to content

Commit b7df0c4

Browse files
authored
Merge pull request #43 from linuxserver/wheel
upate formatting, add lsio wheel index
2 parents 0a33a29 + cae7ae9 commit b7df0c4

File tree

5 files changed

+92
-90
lines changed

5 files changed

+92
-90
lines changed

Dockerfile

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,36 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="aptalca"
99

1010
RUN \
11-
echo "**** install build packages ****" && \
12-
apk add --no-cache --virtual=build-dependencies \
13-
build-base \
14-
cargo \
15-
libffi-dev \
16-
openldap-dev \
17-
python3-dev && \
18-
echo "**** install runtime packages ****" && \
19-
apk add --no-cache \
20-
libffi \
21-
libldap \
22-
py3-pip \
23-
python3 && \
24-
if [ -z ${LDAP_VERSION+x} ]; then \
25-
LDAP_INSTALL="python-ldap"; \
26-
else \
27-
LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \
28-
fi && \
29-
pip3 install -U --no-cache-dir \
30-
pip && \
31-
pip install -U \
32-
cryptography \
33-
${LDAP_INSTALL} && \
34-
echo "**** cleanup ****" && \
35-
apk del --purge \
36-
build-dependencies && \
37-
rm -rf \
38-
/tmp/* \
39-
/root/.cache \
40-
/root/.cargo
11+
echo "**** install build packages ****" && \
12+
apk add --no-cache --virtual=build-dependencies \
13+
build-base \
14+
cargo \
15+
libffi-dev \
16+
openldap-dev \
17+
python3-dev && \
18+
echo "**** install runtime packages ****" && \
19+
apk add --no-cache \
20+
libffi \
21+
libldap \
22+
py3-pip \
23+
python3 && \
24+
if [ -z ${LDAP_VERSION+x} ]; then \
25+
LDAP_INSTALL="python-ldap"; \
26+
else \
27+
LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \
28+
fi && \
29+
pip3 install -U --no-cache-dir \
30+
pip && \
31+
pip install -U --find-links https://wheel-index.linuxserver.io/alpine/ \
32+
cryptography \
33+
${LDAP_INSTALL} && \
34+
echo "**** cleanup ****" && \
35+
apk del --purge \
36+
build-dependencies && \
37+
rm -rf \
38+
/tmp/* \
39+
/root/.cache \
40+
/root/.cargo
4141

4242
# copy local files
4343
COPY root/ /

Dockerfile.aarch64

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,36 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="aptalca"
99

1010
RUN \
11-
echo "**** install build packages ****" && \
12-
apk add --no-cache --virtual=build-dependencies \
13-
build-base \
14-
cargo \
15-
libffi-dev \
16-
openldap-dev \
17-
python3-dev && \
18-
echo "**** install runtime packages ****" && \
19-
apk add --no-cache \
20-
libffi \
21-
libldap \
22-
py3-pip \
23-
python3 && \
24-
if [ -z ${LDAP_VERSION+x} ]; then \
25-
LDAP_INSTALL="python-ldap"; \
26-
else \
27-
LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \
28-
fi && \
29-
pip3 install -U --no-cache-dir \
30-
pip && \
31-
pip install -U \
32-
cryptography \
33-
${LDAP_INSTALL} && \
34-
echo "**** cleanup ****" && \
35-
apk del --purge \
36-
build-dependencies && \
37-
rm -rf \
38-
/tmp/* \
39-
/root/.cache \
40-
/root/.cargo
11+
echo "**** install build packages ****" && \
12+
apk add --no-cache --virtual=build-dependencies \
13+
build-base \
14+
cargo \
15+
libffi-dev \
16+
openldap-dev \
17+
python3-dev && \
18+
echo "**** install runtime packages ****" && \
19+
apk add --no-cache \
20+
libffi \
21+
libldap \
22+
py3-pip \
23+
python3 && \
24+
if [ -z ${LDAP_VERSION+x} ]; then \
25+
LDAP_INSTALL="python-ldap"; \
26+
else \
27+
LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \
28+
fi && \
29+
pip3 install -U --no-cache-dir \
30+
pip && \
31+
pip install -U --find-links https://wheel-index.linuxserver.io/alpine/ \
32+
cryptography \
33+
${LDAP_INSTALL} && \
34+
echo "**** cleanup ****" && \
35+
apk del --purge \
36+
build-dependencies && \
37+
rm -rf \
38+
/tmp/* \
39+
/root/.cache \
40+
/root/.cargo
4141

4242
# copy local files
4343
COPY root/ /

Dockerfile.armhf

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,36 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="aptalca"
99

1010
RUN \
11-
echo "**** install build packages ****" && \
12-
apk add --no-cache --virtual=build-dependencies \
13-
build-base \
14-
cargo \
15-
libffi-dev \
16-
openldap-dev \
17-
python3-dev && \
18-
echo "**** install runtime packages ****" && \
19-
apk add --no-cache \
20-
libffi \
21-
libldap \
22-
py3-pip \
23-
python3 && \
24-
if [ -z ${LDAP_VERSION+x} ]; then \
25-
LDAP_INSTALL="python-ldap"; \
26-
else \
27-
LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \
28-
fi && \
29-
pip3 install -U --no-cache-dir \
30-
pip && \
31-
pip install -U \
32-
cryptography \
33-
${LDAP_INSTALL} && \
34-
echo "**** cleanup ****" && \
35-
apk del --purge \
36-
build-dependencies && \
37-
rm -rf \
38-
/tmp/* \
39-
/root/.cache \
40-
/root/.cargo
11+
echo "**** install build packages ****" && \
12+
apk add --no-cache --virtual=build-dependencies \
13+
build-base \
14+
cargo \
15+
libffi-dev \
16+
openldap-dev \
17+
python3-dev && \
18+
echo "**** install runtime packages ****" && \
19+
apk add --no-cache \
20+
libffi \
21+
libldap \
22+
py3-pip \
23+
python3 && \
24+
if [ -z ${LDAP_VERSION+x} ]; then \
25+
LDAP_INSTALL="python-ldap"; \
26+
else \
27+
LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \
28+
fi && \
29+
pip3 install -U --no-cache-dir \
30+
pip && \
31+
pip install -U --find-links https://wheel-index.linuxserver.io/alpine/ \
32+
cryptography \
33+
${LDAP_INSTALL} && \
34+
echo "**** cleanup ****" && \
35+
apk del --purge \
36+
build-dependencies && \
37+
rm -rf \
38+
/tmp/* \
39+
/root/.cache \
40+
/root/.cargo
4141

4242
# copy local files
4343
COPY root/ /

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
214214

215215
## Versions
216216

217+
* **14.05.21:** - Add linuxserver wheel index.
217218
* **12.02.21:** - Clean up cargo/rust cache.
218219
* **10.02.21:** - Rebasing to alpine 3.13.
219220
* **08.09.20:** - Set form action correctly.

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ app_setup_block: |
4343
4444
# changelog
4545
changelogs:
46+
- { date: "14.05.21:", desc: "Add linuxserver wheel index." }
4647
- { date: "12.02.21:", desc: "Clean up cargo/rust cache." }
4748
- { date: "10.02.21:", desc: "Rebasing to alpine 3.13." }
4849
- { date: "08.09.20:", desc: "Set form action correctly." }

0 commit comments

Comments
 (0)