-
Notifications
You must be signed in to change notification settings - Fork 452
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.
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
Switching systray dependency to one without glibc requirements #14197
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's remove the copying of libraries in the Makefile:
Lines 427 to 447 in d108147
# Build desktop executable for Linux. | |
# | |
# Usage: | |
# FLEET_DESKTOP_VERSION=0.0.1 make desktop-linux | |
# | |
# Output: desktop.tar.gz | |
desktop-linux: | |
docker build -f Dockerfile-desktop-linux -t desktop-linux-builder . | |
docker run --rm -v $(shell pwd):/output desktop-linux-builder /bin/bash -c "\ | |
mkdir /output/fleet-desktop && \ | |
go build -o /output/fleet-desktop/fleet-desktop -ldflags "-X=main.version=$(FLEET_DESKTOP_VERSION)" /usr/src/fleet/orbit/cmd/desktop && \ | |
cp /usr/lib/x86_64-linux-gnu/libayatana-appindicator3.so.1 \ | |
/usr/lib/x86_64-linux-gnu/libayatana-ido3-0.4.so.0 \ | |
/usr/lib/x86_64-linux-gnu/libayatana-indicator3.so.7 \ | |
/lib/x86_64-linux-gnu/libm.so.6 \ | |
/usr/lib/x86_64-linux-gnu/libcairo.so.2 \ | |
/usr/lib/x86_64-linux-gnu/libdbusmenu-gtk3.so.4 \ | |
/usr/lib/x86_64-linux-gnu/libdbusmenu-glib.so.4 \ | |
/output/fleet-desktop && cd /output && \ | |
tar czf desktop.tar.gz fleet-desktop && \ | |
rm -r fleet-desktop" |
Have we defined our minimum versions of OSs we support for fleetd (with Fleet Desktop enabled)?
Asking this because IIRC this change didn't work on CentOS 7, but maybe we are a-ok with this (and this change makes the linux support much more maintainable than current state - e.g. glibc issues). |
Does this include CentOS 7.1+? Our docs say we support CentOS 7.1+: https://fleetdm.com/docs/using-fleet/supported-host-operating-systems#supported-host-operating-systems Not saying this can't or shouldn't change. I'm not sure what version our users/customers are on... |
I was still attempting to setup testing on physical devices w/ these changes just to be sure it worked for all 3 before removing the packages and testing again. Yes I will test on CentOS too and figure that out. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #14197 +/- ##
=======================================
Coverage 58.83% 58.84%
=======================================
Files 954 954
Lines 80174 80187 +13
Branches 2215 2215
=======================================
+ Hits 47169 47183 +14
+ Misses 29331 29329 -2
- Partials 3674 3675 +1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
@georgekarrv The handbook pages in this PR are duplicative and already merged. Check the files changed (55?) is that correct? |
@Sampfluger88 fixed |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
(I haven't reviewed the Helm chars but they were used only for testing so we are g2g IMO.)
Looks good to me. @rfairburn take a look when you have a moment? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't had time to fully test the helm chart, but looking at it everything appears 100% good to me. No concerns here from what I see.
This fixes #11958 |
Checklist for submitter
changes/
ororbit/changes/
.See Changes files for more information.