From 1d7e447e09d6492b9eed8b88feaf8f68615dfe51 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 10 Dec 2021 14:04:13 +0000 Subject: [PATCH 1/9] Use LSIO wheel repo, add cargo for rust builds --- Dockerfile | 92 +++++++++++++++++++++++----------------------- Dockerfile.aarch64 | 92 +++++++++++++++++++++++----------------------- Dockerfile.armhf | 92 +++++++++++++++++++++++----------------------- 3 files changed, 138 insertions(+), 138 deletions(-) diff --git a/Dockerfile b/Dockerfile index e835f7f..1bb182a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,52 +8,52 @@ 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 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/* # copy local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6f18ae1..aee7521 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -8,52 +8,52 @@ 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 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/* # copy local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index bbd54a8..a658b6d 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -8,52 +8,52 @@ 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 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/* # copy local files COPY root/ / From ba70dff8c0561db9232175059b4e26b39e31d83a Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 10 Dec 2021 14:11:02 +0000 Subject: [PATCH 2/9] Add VOLUME --- Dockerfile | 2 ++ Dockerfile.aarch64 | 2 ++ Dockerfile.armhf | 2 ++ 3 files changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index 1bb182a..9f924ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,3 +60,5 @@ COPY root/ / # ports and volumes EXPOSE 8000 + +VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index aee7521..7ffc190 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -60,3 +60,5 @@ COPY root/ / # ports and volumes EXPOSE 8000 + +VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index a658b6d..711f0c8 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -60,3 +60,5 @@ COPY root/ / # ports and volumes EXPOSE 8000 + +VOLUME /config From 1f0f6d11a0d042c3f6ac573d9a2f1822de089da2 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 10 Dec 2021 14:27:29 +0000 Subject: [PATCH 3/9] Rebase to 3.15, clear cargo cache dirs --- Dockerfile | 6 ++++-- Dockerfile.aarch64 | 6 ++++-- Dockerfile.armhf | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9f924ec..db9f666 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 @@ -53,7 +53,9 @@ RUN \ apk del --purge \ build-dependencies && \ rm -rf \ - /tmp/* + /tmp/* \ + ${HOME}/.cargo \ + ${HOME}/.cache # copy local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 7ffc190..5ac591e 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 @@ -53,7 +53,9 @@ RUN \ apk del --purge \ build-dependencies && \ rm -rf \ - /tmp/* + /tmp/* \ + ${HOME}/.cargo \ + ${HOME}/.cache # copy local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 711f0c8..0c9e543 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 @@ -53,7 +53,9 @@ RUN \ apk del --purge \ build-dependencies && \ rm -rf \ - /tmp/* + /tmp/* \ + ${HOME}/.cargo \ + ${HOME}/.cache # copy local files COPY root/ / From 838c0199e3ad0be180b820b993a237f7bffa2b74 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 10 Dec 2021 14:35:25 +0000 Subject: [PATCH 4/9] Update pip to latest --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index db9f666..52b0b4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,6 +47,7 @@ RUN \ 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 ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5ac591e..ac92909 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -47,6 +47,7 @@ RUN \ 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 ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 0c9e543..5878181 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -47,6 +47,7 @@ RUN \ 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 ****" && \ From b0f0c37dcae5fbd792f85dfbc7e28a80a9add8c3 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 10 Dec 2021 14:53:54 +0000 Subject: [PATCH 5/9] Different pip install approach --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 52b0b4d..ceb077c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ RUN \ python3 -m ensurepip && \ rm -rf /usr/lib/python*/ensurepip && \ cd /app/netbox && \ - pip3 install --no-cache-dir -U pip \ + /usr/bin/python3 -m pip install --upgrade 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 ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ac92909..61471b0 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -47,7 +47,7 @@ RUN \ python3 -m ensurepip && \ rm -rf /usr/lib/python*/ensurepip && \ cd /app/netbox && \ - pip3 install --no-cache-dir -U pip \ + /usr/bin/python3 -m pip install --upgrade 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 ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 5878181..0a0bcb4 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -47,7 +47,7 @@ RUN \ python3 -m ensurepip && \ rm -rf /usr/lib/python*/ensurepip && \ cd /app/netbox && \ - pip3 install --no-cache-dir -U pip \ + /usr/bin/python3 -m pip install --upgrade 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 ****" && \ From 9e271b985dbe6c8fc17da339c84bfd1bb1edf317 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 10 Dec 2021 14:55:57 +0000 Subject: [PATCH 6/9] Don't try and upgrade pip --- Dockerfile | 1 - Dockerfile.aarch64 | 1 - Dockerfile.armhf | 1 - 3 files changed, 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index ceb077c..db9f666 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,6 @@ RUN \ python3 -m ensurepip && \ rm -rf /usr/lib/python*/ensurepip && \ cd /app/netbox && \ - /usr/bin/python3 -m pip install --upgrade 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 ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 61471b0..5ac591e 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -47,7 +47,6 @@ RUN \ python3 -m ensurepip && \ rm -rf /usr/lib/python*/ensurepip && \ cd /app/netbox && \ - /usr/bin/python3 -m pip install --upgrade 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 ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 0a0bcb4..0c9e543 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -47,7 +47,6 @@ RUN \ python3 -m ensurepip && \ rm -rf /usr/lib/python*/ensurepip && \ cd /app/netbox && \ - /usr/bin/python3 -m pip install --upgrade 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 ****" && \ From df646fa4c56626288baeb4e74f4a67444afdc312 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 10 Dec 2021 15:04:32 +0000 Subject: [PATCH 7/9] Fix pip install formatting --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + Dockerfile.armhf | 1 + 3 files changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index db9f666..714e1b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,6 +47,7 @@ RUN \ 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 ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 5ac591e..ab507c5 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -47,6 +47,7 @@ RUN \ 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 ****" && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 0c9e543..698617a 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -47,6 +47,7 @@ RUN \ 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 ****" && \ From b0c67c7d6f0c35af1dc5abf957e2b1d7c7468dbf Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 10 Dec 2021 15:31:54 +0000 Subject: [PATCH 8/9] Rebase to Alpine 3.15 --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) 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." } From e1954f91ac798b73fc5d31c76fd1af2c6724a55e Mon Sep 17 00:00:00 2001 From: TheSpad Date: Fri, 10 Dec 2021 15:58:04 +0000 Subject: [PATCH 9/9] Don't run web CI as it will always fail (no db) --- jenkins-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'