diff --git a/Dockerfile b/Dockerfile index e835f7f..714e1b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 @@ -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 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6f18ae1..ab507c5 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -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 @@ -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 diff --git a/Dockerfile.armhf b/Dockerfile.armhf index bbd54a8..698617a 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -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 @@ -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 diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 46f57df..473bce9 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -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' diff --git a/readme-vars.yml b/readme-vars.yml index 236bdd8..b625804 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -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." }