Skip to content

Use LSIO wheel repo, add cargo for rust builds, rebase to 3.15 #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Dec 11, 2021
Merged

Use LSIO wheel repo, add cargo for rust builds, rebase to 3.15 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1d7e447
Use LSIO wheel repo, add cargo for rust builds
thespad Dec 10, 2021
ba70dff
Add VOLUME
thespad Dec 10, 2021
1f0f6d1
Rebase to 3.15, clear cargo cache dirs
thespad Dec 10, 2021
838c019
Update pip to latest
thespad Dec 10, 2021
b0f0c37
Different pip install approach
thespad Dec 10, 2021
9e271b9
Don't try and upgrade pip
thespad Dec 10, 2021
df646fa
Fix pip install formatting
thespad Dec 10, 2021
b0c67c7
Rebase to Alpine 3.15
thespad Dec 10, 2021
e1954f9
Don't run web CI as it will always fail (no db)
thespad Dec 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 52 additions & 47 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:3.12
FROM ghcr.io/linuxserver/baseimage-alpine:3.15

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

RUN \
echo "**** install build packages ****" && \
apk add --no-cache --upgrade --virtual=build-dependencies \
curl \
gcc \
git \
jpeg-dev \
libffi-dev \
libxslt-dev \
libxml2-dev \
musl-dev \
openssl-dev \
postgresql-dev \
python3-dev \
zlib-dev && \
echo "**** install runtime packages ****" && \
apk add --no-cache --upgrade \
postgresql-client \
py3-pillow \
py3-setuptools \
python3 \
uwsgi \
uwsgi-python && \
echo "**** install netbox ****" && \
mkdir -p /app/netbox && \
if [ -z ${NETBOX_RELEASE+x} ]; then \
NETBOX_RELEASE=$(curl -sX GET "https://api.github.com/repos/netbox-community/netbox/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/netbox.tar.gz -L \
"https://github.com/netbox-community/netbox/archive/${NETBOX_RELEASE}.tar.gz" && \
tar xf \
/tmp/netbox.tar.gz -C \
/app/netbox/ --strip-components=1 && \
echo "**** install pip packages ****" && \
python3 -m ensurepip && \
rm -rf /usr/lib/python*/ensurepip && \
cd /app/netbox && \
pip3 install wheel && \
pip3 install -r requirements.txt && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/root/.cache \
/tmp/*
echo "**** install build packages ****" && \
apk add --no-cache --upgrade --virtual=build-dependencies \
curl \
cargo \
gcc \
git \
jpeg-dev \
libffi-dev \
libxslt-dev \
libxml2-dev \
musl-dev \
openssl-dev \
postgresql-dev \
python3-dev \
zlib-dev && \
echo "**** install runtime packages ****" && \
apk add --no-cache --upgrade \
postgresql-client \
py3-pillow \
py3-setuptools \
python3 \
uwsgi \
uwsgi-python && \
echo "**** install netbox ****" && \
mkdir -p /app/netbox && \
if [ -z ${NETBOX_RELEASE+x} ]; then \
NETBOX_RELEASE=$(curl -sX GET "https://api.github.com/repos/netbox-community/netbox/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/netbox.tar.gz -L \
"https://github.com/netbox-community/netbox/archive/${NETBOX_RELEASE}.tar.gz" && \
tar xf \
/tmp/netbox.tar.gz -C \
/app/netbox/ --strip-components=1 && \
echo "**** install pip packages ****" && \
python3 -m ensurepip && \
rm -rf /usr/lib/python*/ensurepip && \
cd /app/netbox && \
pip3 install --no-cache-dir -U pip && \
pip3 install --no-cache-dir wheel && \
pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ -r requirements.txt && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/tmp/* \
${HOME}/.cargo \
${HOME}/.cache

# copy local files
COPY root/ /

# ports and volumes
EXPOSE 8000

VOLUME /config
99 changes: 52 additions & 47 deletions Dockerfile.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.12
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15

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

RUN \
echo "**** install build packages ****" && \
apk add --no-cache --upgrade --virtual=build-dependencies \
curl \
gcc \
git \
jpeg-dev \
libffi-dev \
libxslt-dev \
libxml2-dev \
musl-dev \
openssl-dev \
postgresql-dev \
python3-dev \
zlib-dev && \
echo "**** install runtime packages ****" && \
apk add --no-cache --upgrade \
postgresql-client \
py3-pillow \
py3-setuptools \
python3 \
uwsgi \
uwsgi-python && \
echo "**** install netbox ****" && \
mkdir -p /app/netbox && \
if [ -z ${NETBOX_RELEASE+x} ]; then \
NETBOX_RELEASE=$(curl -sX GET "https://api.github.com/repos/netbox-community/netbox/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/netbox.tar.gz -L \
"https://github.com/netbox-community/netbox/archive/${NETBOX_RELEASE}.tar.gz" && \
tar xf \
/tmp/netbox.tar.gz -C \
/app/netbox/ --strip-components=1 && \
echo "**** install pip packages ****" && \
python3 -m ensurepip && \
rm -rf /usr/lib/python*/ensurepip && \
cd /app/netbox && \
pip3 install wheel && \
pip3 install -r requirements.txt && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/root/.cache \
/tmp/*
echo "**** install build packages ****" && \
apk add --no-cache --upgrade --virtual=build-dependencies \
curl \
cargo \
gcc \
git \
jpeg-dev \
libffi-dev \
libxslt-dev \
libxml2-dev \
musl-dev \
openssl-dev \
postgresql-dev \
python3-dev \
zlib-dev && \
echo "**** install runtime packages ****" && \
apk add --no-cache --upgrade \
postgresql-client \
py3-pillow \
py3-setuptools \
python3 \
uwsgi \
uwsgi-python && \
echo "**** install netbox ****" && \
mkdir -p /app/netbox && \
if [ -z ${NETBOX_RELEASE+x} ]; then \
NETBOX_RELEASE=$(curl -sX GET "https://api.github.com/repos/netbox-community/netbox/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/netbox.tar.gz -L \
"https://github.com/netbox-community/netbox/archive/${NETBOX_RELEASE}.tar.gz" && \
tar xf \
/tmp/netbox.tar.gz -C \
/app/netbox/ --strip-components=1 && \
echo "**** install pip packages ****" && \
python3 -m ensurepip && \
rm -rf /usr/lib/python*/ensurepip && \
cd /app/netbox && \
pip3 install --no-cache-dir -U pip && \
pip3 install --no-cache-dir wheel && \
pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ -r requirements.txt && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/tmp/* \
${HOME}/.cargo \
${HOME}/.cache

# copy local files
COPY root/ /

# ports and volumes
EXPOSE 8000

VOLUME /config
99 changes: 52 additions & 47 deletions Dockerfile.armhf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.12
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15

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

RUN \
echo "**** install build packages ****" && \
apk add --no-cache --upgrade --virtual=build-dependencies \
curl \
gcc \
git \
jpeg-dev \
libffi-dev \
libxslt-dev \
libxml2-dev \
musl-dev \
openssl-dev \
postgresql-dev \
python3-dev \
zlib-dev && \
echo "**** install runtime packages ****" && \
apk add --no-cache --upgrade \
postgresql-client \
py3-pillow \
py3-setuptools \
python3 \
uwsgi \
uwsgi-python && \
echo "**** install netbox ****" && \
mkdir -p /app/netbox && \
if [ -z ${NETBOX_RELEASE+x} ]; then \
NETBOX_RELEASE=$(curl -sX GET "https://api.github.com/repos/netbox-community/netbox/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/netbox.tar.gz -L \
"https://github.com/netbox-community/netbox/archive/${NETBOX_RELEASE}.tar.gz" && \
tar xf \
/tmp/netbox.tar.gz -C \
/app/netbox/ --strip-components=1 && \
echo "**** install pip packages ****" && \
python3 -m ensurepip && \
rm -rf /usr/lib/python*/ensurepip && \
cd /app/netbox && \
pip3 install wheel && \
pip3 install -r requirements.txt && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/root/.cache \
/tmp/*
echo "**** install build packages ****" && \
apk add --no-cache --upgrade --virtual=build-dependencies \
curl \
cargo \
gcc \
git \
jpeg-dev \
libffi-dev \
libxslt-dev \
libxml2-dev \
musl-dev \
openssl-dev \
postgresql-dev \
python3-dev \
zlib-dev && \
echo "**** install runtime packages ****" && \
apk add --no-cache --upgrade \
postgresql-client \
py3-pillow \
py3-setuptools \
python3 \
uwsgi \
uwsgi-python && \
echo "**** install netbox ****" && \
mkdir -p /app/netbox && \
if [ -z ${NETBOX_RELEASE+x} ]; then \
NETBOX_RELEASE=$(curl -sX GET "https://api.github.com/repos/netbox-community/netbox/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
fi && \
curl -o \
/tmp/netbox.tar.gz -L \
"https://github.com/netbox-community/netbox/archive/${NETBOX_RELEASE}.tar.gz" && \
tar xf \
/tmp/netbox.tar.gz -C \
/app/netbox/ --strip-components=1 && \
echo "**** install pip packages ****" && \
python3 -m ensurepip && \
rm -rf /usr/lib/python*/ensurepip && \
cd /app/netbox && \
pip3 install --no-cache-dir -U pip && \
pip3 install --no-cache-dir wheel && \
pip3 install --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ -r requirements.txt && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/tmp/* \
${HOME}/.cargo \
${HOME}/.cache

# copy local files
COPY root/ /

# ports and volumes
EXPOSE 8000

VOLUME /config
2 changes: 1 addition & 1 deletion jenkins-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ repo_vars:
- DIST_IMAGE = 'alpine'
- MULTIARCH='true'
- CI='true'
- CI_WEB='true'
- CI_WEB='false'
- CI_PORT='8000'
- CI_SSL='false'
- CI_DELAY='120'
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ app_setup_block: |

# changelog
changelogs:
- { date: "10.12.21:", desc: "Rebase to Alpine 3.15." }
- { date: "26.04.21:", desc: "Added Redis database environment variables." }
- { date: "03.02.21:", desc: "Added remote authentication environment variables." }
- { date: "02.01.21:", desc: "Added BASE_PATH environment variable." }
Expand Down