Skip to content

Commit f1e191b

Browse files
authored
Merge pull request #45 from linuxserver/3.15
2 parents a0d92dd + 47625cd commit f1e191b

File tree

5 files changed

+11
-12
lines changed

5 files changed

+11
-12
lines changed

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:3.13
1+
FROM ghcr.io/linuxserver/baseimage-alpine:3.15
22

33
# set version label
44
ARG BUILD_DATE
@@ -26,9 +26,8 @@ RUN \
2626
else \
2727
LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \
2828
fi && \
29-
pip3 install -U --no-cache-dir \
30-
pip && \
31-
pip install -U --find-links https://wheel-index.linuxserver.io/alpine/ \
29+
pip3 install -U --no-cache-dir pip setuptools wheel && \
30+
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \
3231
cryptography \
3332
${LDAP_INSTALL} && \
3433
echo "**** cleanup ****" && \

Dockerfile.aarch64

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.13
1+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
22

33
# set version label
44
ARG BUILD_DATE
@@ -26,9 +26,8 @@ RUN \
2626
else \
2727
LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \
2828
fi && \
29-
pip3 install -U --no-cache-dir \
30-
pip && \
31-
pip install -U --find-links https://wheel-index.linuxserver.io/alpine/ \
29+
pip3 install -U --no-cache-dir pip setuptools wheel && \
30+
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \
3231
cryptography \
3332
${LDAP_INSTALL} && \
3433
echo "**** cleanup ****" && \

Dockerfile.armhf

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.13
1+
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
22

33
# set version label
44
ARG BUILD_DATE
@@ -26,9 +26,8 @@ RUN \
2626
else \
2727
LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \
2828
fi && \
29-
pip3 install -U --no-cache-dir \
30-
pip && \
31-
pip install -U --find-links https://wheel-index.linuxserver.io/alpine/ \
29+
pip3 install -U --no-cache-dir pip setuptools wheel && \
30+
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \
3231
cryptography \
3332
${LDAP_INSTALL} && \
3433
echo "**** cleanup ****" && \

README.md

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

214214
## Versions
215215

216+
* **19.09.22:** - Rebase to alpine 3.15.
216217
* **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.

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: "19.09.22:", desc: "Rebase to alpine 3.15." }
4647
- { date: "14.05.21:", desc: "Add linuxserver wheel index." }
4748
- { date: "12.02.21:", desc: "Clean up cargo/rust cache." }
4849
- { date: "10.02.21:", desc: "Rebasing to alpine 3.13." }

0 commit comments

Comments
 (0)