From 7aebab5e146aa0626a82785b1314b3cc687deb49 Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan@faked.org>
Date: Tue, 28 May 2024 23:19:07 +0200
Subject: [PATCH] add prometheus node exporter, remove dnsmasq and dhcpd
---
.gitlab-ci.yml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a04521a..633f4c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,9 +5,10 @@ stages:
variables:
OPENWRT_VERSION: 23.05.3
FILES: ${CI_PROJECT_DIR}/files
- DEFAULT_PACKAGES: luci
+ DEFAULT_PACKAGES: luci wpad-mbedtls prometheus-node-exporter-lua prometheus-node-exporter-lua-openwrt prometheus-node-exporter-lua-wifi prometheus-node-exporter-lua-wifi_stations
EXTRA_PACKAGES: openwisp-config openwisp-monitoring netjson-monitoring
- DISABLED_SERVICES: dnsmasq firewall odhcpd
+ REMOVE_PACKAGES: dnsmasq odhcpd-ipv6only wpad-basic-mbedtls
+ DISABLED_SERVICES: firewall
EXTRA_IMAGE_NAME: fakedOrg
.build_image:
@@ -19,8 +20,8 @@ variables:
- for url in $(cat packages.txt); do curl --create-dirs -s -O --output-dir /builder/packages $url; done && ls -1 /builder/packages
- cd /builder
script:
- - echo PROFILE=${PROFILE} FILES=${FILES} PACKAGES="${DEFAULT_PACKAGES} ${EXTRA_PACKAGES}"
- - make image PROFILE=${PROFILE} FILES=${FILES} PACKAGES="${DEFAULT_PACKAGES} ${EXTRA_PACKAGES}"
+ - export REMOVE_PACKAGES=$(for package in ${REMOVE_PACKAGES}; do echo -n "-${package} "; done)
+ - make image PROFILE=${PROFILE} FILES=${FILES} PACKAGES="${DEFAULT_PACKAGES} ${EXTRA_PACKAGES} ${REMOVE_PACKAGES}"
after_script:
- if [[ -d /builder/bin ]]; then mv /builder/bin .; fi
- if [[ -d /builder/dl ]]; then mv /builder/dl .; fi
--
GitLab