Skip to content

Commit 4d87314

Browse files
authored
Merge pull request #32 from linuxserver/pillow-fix
Remove py3-pillow package and build from pip
2 parents 7f29281 + ddaabfe commit 4d87314

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ RUN \
2626
echo "**** install runtime packages ****" && \
2727
apk add --no-cache --upgrade \
2828
postgresql-client \
29-
py3-pillow \
3029
py3-setuptools \
3130
python3 \
3231
uwsgi \
@@ -48,7 +47,7 @@ RUN \
4847
rm -rf /usr/lib/python*/ensurepip && \
4948
cd /app/netbox && \
5049
pip3 install --no-cache-dir -U pip wheel && \
51-
pip3 install --no-cache-dir --ignore-installed --find-links https://wheel-index.linuxserver.io/alpine/ -r requirements.txt && \
50+
pip3 install --no-cache-dir --ignore-installed --find-links https://wheel-index.linuxserver.io/alpine-3.15/ -r requirements.txt && \
5251
echo "**** cleanup ****" && \
5352
apk del --purge \
5453
build-dependencies && \

Dockerfile.aarch64

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ RUN \
2626
echo "**** install runtime packages ****" && \
2727
apk add --no-cache --upgrade \
2828
postgresql-client \
29-
py3-pillow \
3029
py3-setuptools \
3130
python3 \
3231
uwsgi \
@@ -48,7 +47,7 @@ RUN \
4847
rm -rf /usr/lib/python*/ensurepip && \
4948
cd /app/netbox && \
5049
pip3 install --no-cache-dir -U pip wheel && \
51-
pip3 install --no-cache-dir --ignore-installed --find-links https://wheel-index.linuxserver.io/alpine/ -r requirements.txt && \
50+
pip3 install --no-cache-dir --ignore-installed --find-links https://wheel-index.linuxserver.io/alpine-3.15/ -r requirements.txt && \
5251
echo "**** cleanup ****" && \
5352
apk del --purge \
5453
build-dependencies && \

Dockerfile.armhf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ RUN \
2626
echo "**** install runtime packages ****" && \
2727
apk add --no-cache --upgrade \
2828
postgresql-client \
29-
py3-pillow \
3029
py3-setuptools \
3130
python3 \
3231
uwsgi \
@@ -48,7 +47,7 @@ RUN \
4847
rm -rf /usr/lib/python*/ensurepip && \
4948
cd /app/netbox && \
5049
pip3 install --no-cache-dir -U pip wheel && \
51-
pip3 install --no-cache-dir --ignore-installed --find-links https://wheel-index.linuxserver.io/alpine/ -r requirements.txt && \
50+
pip3 install --no-cache-dir --ignore-installed --find-links https://wheel-index.linuxserver.io/alpine-3.15/ -r requirements.txt && \
5251
echo "**** cleanup ****" && \
5352
apk del --purge \
5453
build-dependencies && \

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ app_setup_block: |
5959
6060
# changelog
6161
changelogs:
62+
- { date: "10.12.21:", desc: "Remove py3-pillow package to fix dependency issue with 3.2.0." }
6263
- { date: "10.12.21:", desc: "Rebase to Alpine 3.15." }
6364
- { date: "26.04.21:", desc: "Added Redis database environment variables." }
6465
- { date: "03.02.21:", desc: "Added remote authentication environment variables." }

0 commit comments

Comments
 (0)