Skip to content

Commit 7985868

Browse files
thespadthespad
authored
Merge pull request #23 from linuxserver/pip-fix
2 parents b4b865c + e1954f9 commit 7985868

File tree

5 files changed

+158
-142
lines changed

5 files changed

+158
-142
lines changed

‎Dockerfile‎

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

33
# set version label
44
ARG BUILD_DATE
@@ -8,55 +8,60 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="alex-phillips"
99

1010
RUN \
11-
echo "**** install build packages ****" && \
12-
apk add --no-cache --upgrade --virtual=build-dependencies \
13-
curl \
14-
gcc \
15-
git \
16-
jpeg-dev \
17-
libffi-dev \
18-
libxslt-dev \
19-
libxml2-dev \
20-
musl-dev \
21-
openssl-dev \
22-
postgresql-dev \
23-
python3-dev \
24-
zlib-dev && \
25-
echo "**** install runtime packages ****" && \
26-
apk add --no-cache --upgrade \
27-
postgresql-client \
28-
py3-pillow \
29-
py3-setuptools \
30-
python3 \
31-
uwsgi \
32-
uwsgi-python && \
33-
echo "**** install netbox ****" && \
34-
mkdir -p /app/netbox && \
35-
if [ -z ${NETBOX_RELEASE+x} ]; then \
36-
NETBOX_RELEASE=$(curl -sX GET "https://api.github.com/repos/netbox-community/netbox/releases/latest" \
37-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
38-
fi && \
39-
curl -o \
40-
/tmp/netbox.tar.gz -L \
41-
"https://github.com/netbox-community/netbox/archive/${NETBOX_RELEASE}.tar.gz" && \
42-
tar xf \
43-
/tmp/netbox.tar.gz -C \
44-
/app/netbox/ --strip-components=1 && \
45-
echo "**** install pip packages ****" && \
46-
python3 -m ensurepip && \
47-
rm -rf /usr/lib/python*/ensurepip && \
48-
cd /app/netbox && \
49-
pip3 install wheel && \
50-
pip3 install -r requirements.txt && \
51-
echo "**** cleanup ****" && \
52-
apk del --purge \
53-
build-dependencies && \
54-
rm -rf \
55-
/root/.cache \
56-
/tmp/*
11+
echo "**** install build packages ****" && \
12+
apk add --no-cache --upgrade --virtual=build-dependencies \
13+
curl \
14+
cargo \
15+
gcc \
16+
git \
17+
jpeg-dev \
18+
libffi-dev \
19+
libxslt-dev \
20+
libxml2-dev \
21+
musl-dev \
22+
openssl-dev \
23+
postgresql-dev \
24+
python3-dev \
25+
zlib-dev && \
26+
echo "**** install runtime packages ****" && \
27+
apk add --no-cache --upgrade \
28+
postgresql-client \
29+
py3-pillow \
30+
py3-setuptools \
31+
python3 \
32+
uwsgi \
33+
uwsgi-python && \
34+
echo "**** install netbox ****" && \
35+
mkdir -p /app/netbox && \
36+
if [ -z ${NETBOX_RELEASE+x} ]; then \
37+
NETBOX_RELEASE=$(curl -sX GET "https://api.github.com/repos/netbox-community/netbox/releases/latest" \
38+
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
39+
fi && \
40+
curl -o \
41+
/tmp/netbox.tar.gz -L \
42+
"https://github.com/netbox-community/netbox/archive/${NETBOX_RELEASE}.tar.gz" && \
43+
tar xf \
44+
/tmp/netbox.tar.gz -C \
45+
/app/netbox/ --strip-components=1 && \
46+
echo "**** install pip packages ****" && \
47+
python3 -m ensurepip && \
48+
rm -rf /usr/lib/python*/ensurepip && \
49+
cd /app/netbox && \
50+
pip3 install --no-cache-dir -U pip && \
51+
pip3 install --no-cache-dir wheel && \
52+
pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ -r requirements.txt && \
53+
echo "**** cleanup ****" && \
54+
apk del --purge \
55+
build-dependencies && \
56+
rm -rf \
57+
/tmp/* \
58+
${HOME}/.cargo \
59+
${HOME}/.cache
5760

5861
# copy local files
5962
COPY root/ /
6063

6164
# ports and volumes
6265
EXPOSE 8000
66+
67+
VOLUME /config

‎Dockerfile.aarch64‎

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

33
# set version label
44
ARG BUILD_DATE
@@ -8,55 +8,60 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="alex-phillips"
99

1010
RUN \
11-
echo "**** install build packages ****" && \
12-
apk add --no-cache --upgrade --virtual=build-dependencies \
13-
curl \
14-
gcc \
15-
git \
16-
jpeg-dev \
17-
libffi-dev \
18-
libxslt-dev \
19-
libxml2-dev \
20-
musl-dev \
21-
openssl-dev \
22-
postgresql-dev \
23-
python3-dev \
24-
zlib-dev && \
25-
echo "**** install runtime packages ****" && \
26-
apk add --no-cache --upgrade \
27-
postgresql-client \
28-
py3-pillow \
29-
py3-setuptools \
30-
python3 \
31-
uwsgi \
32-
uwsgi-python && \
33-
echo "**** install netbox ****" && \
34-
mkdir -p /app/netbox && \
35-
if [ -z ${NETBOX_RELEASE+x} ]; then \
36-
NETBOX_RELEASE=$(curl -sX GET "https://api.github.com/repos/netbox-community/netbox/releases/latest" \
37-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
38-
fi && \
39-
curl -o \
40-
/tmp/netbox.tar.gz -L \
41-
"https://github.com/netbox-community/netbox/archive/${NETBOX_RELEASE}.tar.gz" && \
42-
tar xf \
43-
/tmp/netbox.tar.gz -C \
44-
/app/netbox/ --strip-components=1 && \
45-
echo "**** install pip packages ****" && \
46-
python3 -m ensurepip && \
47-
rm -rf /usr/lib/python*/ensurepip && \
48-
cd /app/netbox && \
49-
pip3 install wheel && \
50-
pip3 install -r requirements.txt && \
51-
echo "**** cleanup ****" && \
52-
apk del --purge \
53-
build-dependencies && \
54-
rm -rf \
55-
/root/.cache \
56-
/tmp/*
11+
echo "**** install build packages ****" && \
12+
apk add --no-cache --upgrade --virtual=build-dependencies \
13+
curl \
14+
cargo \
15+
gcc \
16+
git \
17+
jpeg-dev \
18+
libffi-dev \
19+
libxslt-dev \
20+
libxml2-dev \
21+
musl-dev \
22+
openssl-dev \
23+
postgresql-dev \
24+
python3-dev \
25+
zlib-dev && \
26+
echo "**** install runtime packages ****" && \
27+
apk add --no-cache --upgrade \
28+
postgresql-client \
29+
py3-pillow \
30+
py3-setuptools \
31+
python3 \
32+
uwsgi \
33+
uwsgi-python && \
34+
echo "**** install netbox ****" && \
35+
mkdir -p /app/netbox && \
36+
if [ -z ${NETBOX_RELEASE+x} ]; then \
37+
NETBOX_RELEASE=$(curl -sX GET "https://api.github.com/repos/netbox-community/netbox/releases/latest" \
38+
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
39+
fi && \
40+
curl -o \
41+
/tmp/netbox.tar.gz -L \
42+
"https://github.com/netbox-community/netbox/archive/${NETBOX_RELEASE}.tar.gz" && \
43+
tar xf \
44+
/tmp/netbox.tar.gz -C \
45+
/app/netbox/ --strip-components=1 && \
46+
echo "**** install pip packages ****" && \
47+
python3 -m ensurepip && \
48+
rm -rf /usr/lib/python*/ensurepip && \
49+
cd /app/netbox && \
50+
pip3 install --no-cache-dir -U pip && \
51+
pip3 install --no-cache-dir wheel && \
52+
pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ -r requirements.txt && \
53+
echo "**** cleanup ****" && \
54+
apk del --purge \
55+
build-dependencies && \
56+
rm -rf \
57+
/tmp/* \
58+
${HOME}/.cargo \
59+
${HOME}/.cache
5760

5861
# copy local files
5962
COPY root/ /
6063

6164
# ports and volumes
6265
EXPOSE 8000
66+
67+
VOLUME /config

‎Dockerfile.armhf‎

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

33
# set version label
44
ARG BUILD_DATE
@@ -8,55 +8,60 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
88
LABEL maintainer="alex-phillips"
99

1010
RUN \
11-
echo "**** install build packages ****" && \
12-
apk add --no-cache --upgrade --virtual=build-dependencies \
13-
curl \
14-
gcc \
15-
git \
16-
jpeg-dev \
17-
libffi-dev \
18-
libxslt-dev \
19-
libxml2-dev \
20-
musl-dev \
21-
openssl-dev \
22-
postgresql-dev \
23-
python3-dev \
24-
zlib-dev && \
25-
echo "**** install runtime packages ****" && \
26-
apk add --no-cache --upgrade \
27-
postgresql-client \
28-
py3-pillow \
29-
py3-setuptools \
30-
python3 \
31-
uwsgi \
32-
uwsgi-python && \
33-
echo "**** install netbox ****" && \
34-
mkdir -p /app/netbox && \
35-
if [ -z ${NETBOX_RELEASE+x} ]; then \
36-
NETBOX_RELEASE=$(curl -sX GET "https://api.github.com/repos/netbox-community/netbox/releases/latest" \
37-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
38-
fi && \
39-
curl -o \
40-
/tmp/netbox.tar.gz -L \
41-
"https://github.com/netbox-community/netbox/archive/${NETBOX_RELEASE}.tar.gz" && \
42-
tar xf \
43-
/tmp/netbox.tar.gz -C \
44-
/app/netbox/ --strip-components=1 && \
45-
echo "**** install pip packages ****" && \
46-
python3 -m ensurepip && \
47-
rm -rf /usr/lib/python*/ensurepip && \
48-
cd /app/netbox && \
49-
pip3 install wheel && \
50-
pip3 install -r requirements.txt && \
51-
echo "**** cleanup ****" && \
52-
apk del --purge \
53-
build-dependencies && \
54-
rm -rf \
55-
/root/.cache \
56-
/tmp/*
11+
echo "**** install build packages ****" && \
12+
apk add --no-cache --upgrade --virtual=build-dependencies \
13+
curl \
14+
cargo \
15+
gcc \
16+
git \
17+
jpeg-dev \
18+
libffi-dev \
19+
libxslt-dev \
20+
libxml2-dev \
21+
musl-dev \
22+
openssl-dev \
23+
postgresql-dev \
24+
python3-dev \
25+
zlib-dev && \
26+
echo "**** install runtime packages ****" && \
27+
apk add --no-cache --upgrade \
28+
postgresql-client \
29+
py3-pillow \
30+
py3-setuptools \
31+
python3 \
32+
uwsgi \
33+
uwsgi-python && \
34+
echo "**** install netbox ****" && \
35+
mkdir -p /app/netbox && \
36+
if [ -z ${NETBOX_RELEASE+x} ]; then \
37+
NETBOX_RELEASE=$(curl -sX GET "https://api.github.com/repos/netbox-community/netbox/releases/latest" \
38+
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
39+
fi && \
40+
curl -o \
41+
/tmp/netbox.tar.gz -L \
42+
"https://github.com/netbox-community/netbox/archive/${NETBOX_RELEASE}.tar.gz" && \
43+
tar xf \
44+
/tmp/netbox.tar.gz -C \
45+
/app/netbox/ --strip-components=1 && \
46+
echo "**** install pip packages ****" && \
47+
python3 -m ensurepip && \
48+
rm -rf /usr/lib/python*/ensurepip && \
49+
cd /app/netbox && \
50+
pip3 install --no-cache-dir -U pip && \
51+
pip3 install --no-cache-dir wheel && \
52+
pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ -r requirements.txt && \
53+
echo "**** cleanup ****" && \
54+
apk del --purge \
55+
build-dependencies && \
56+
rm -rf \
57+
/tmp/* \
58+
${HOME}/.cargo \
59+
${HOME}/.cache
5760

5861
# copy local files
5962
COPY root/ /
6063

6164
# ports and volumes
6265
EXPOSE 8000
66+
67+
VOLUME /config

‎jenkins-vars.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repo_vars:
2020
- DIST_IMAGE = 'alpine'
2121
- MULTIARCH='true'
2222
- CI='true'
23-
- CI_WEB='true'
23+
- CI_WEB='false'
2424
- CI_PORT='8000'
2525
- CI_SSL='false'
2626
- CI_DELAY='120'

‎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: "Rebase to Alpine 3.15." }
6263
- { date: "26.04.21:", desc: "Added Redis database environment variables." }
6364
- { date: "03.02.21:", desc: "Added remote authentication environment variables." }
6465
- { date: "02.01.21:", desc: "Added BASE_PATH environment variable." }

0 commit comments

Comments
 (0)