Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openwrt-openwisp
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jan Grewe
openwrt-openwisp
Commits
7aebab5e
Commit
7aebab5e
authored
1 year ago
by
Jan Grewe
Browse files
Options
Downloads
Patches
Plain Diff
add prometheus node exporter, remove dnsmasq and dhcpd
parent
1eec1f60
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
.gitlab-ci.yml
+5
-4
5 additions, 4 deletions
.gitlab-ci.yml
with
5 additions
and
4 deletions
.gitlab-ci.yml
+
5
−
4
View file @
7aebab5e
...
@@ -5,9 +5,10 @@ stages:
...
@@ -5,9 +5,10 @@ stages:
variables
:
variables
:
OPENWRT_VERSION
:
23.05.3
OPENWRT_VERSION
:
23.05.3
FILES
:
${CI_PROJECT_DIR}/files
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
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
EXTRA_IMAGE_NAME
:
fakedOrg
.build_image
:
.build_image
:
...
@@ -19,8 +20,8 @@ variables:
...
@@ -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
-
for url in $(cat packages.txt); do curl --create-dirs -s -O --output-dir /builder/packages $url; done && ls -1 /builder/packages
-
cd /builder
-
cd /builder
script
:
script
:
-
e
cho PROFILE=${PROFILE} FILES=${FILES} PACKAGES="${DEFAULT_PACKAGES} ${EXTRA_PACKAGES}"
-
e
xport REMOVE_PACKAGES=$(for package in ${REMOVE_PACKAGES}; do echo -n "-${package} "; done)
-
make image PROFILE=${PROFILE} FILES=${FILES} PACKAGES="${DEFAULT_PACKAGES} ${EXTRA_PACKAGES}"
-
make image PROFILE=${PROFILE} FILES=${FILES} PACKAGES="${DEFAULT_PACKAGES} ${EXTRA_PACKAGES}
${REMOVE_PACKAGES}
"
after_script
:
after_script
:
-
if [[ -d /builder/bin ]]; then mv /builder/bin .; fi
-
if [[ -d /builder/bin ]]; then mv /builder/bin .; fi
-
if [[ -d /builder/dl ]]; then mv /builder/dl .; fi
-
if [[ -d /builder/dl ]]; then mv /builder/dl .; fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment