-
-
Notifications
You must be signed in to change notification settings - Fork 278
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
Get container id from mountinfo when cgroup is empty #1648
Get container id from mountinfo when cgroup is empty #1648
Conversation
Codecov ReportBase: 96.81% // Head: 96.81% // Increases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## master #1648 +/- ##
=======================================
Coverage 96.81% 96.81%
=======================================
Files 660 660
Lines 9628 9650 +22
=======================================
+ Hits 9321 9343 +22
Misses 307 307
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
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.
Thanks for this PR! 🙏
Have you tried this PR in real life with docker-compose? (You can build a Gladys docker image very easily directly from Github, I can explain how if needed)
I didn't try on docker-compose yet. If you can explain how to build the docker image directly from GitHub it would be nice, I have some trouble setting up the project on the Apple Silicon (I'm using GitHub Codespaces to develop 😅) |
1a68f49
to
ea86b8e
Compare
ea86b8e
to
0950d00
Compare
It's very easy! In your fork, create 3 environnement variable for Github Actions pointing to a DockerHub account (to push the image to):
Then, go to: Choose the arch you want to build (you can build all, but it takes 1 hour 20 minutes, if you want to try on amd64 cpu only, can be a 2 minutes build )
Weird, I'm on Apple Silicon too (M1 Pro) and it works fine! If you want we can talk about it on the forum, are you on the forum? (our international forum: https://en-community.gladysassistant.com/, we also have a french forum but it seems you're from spain! :) ) |
@Pierre-Gilles Tested on my side, no regression I'm waiting for image to test with compose. |
@Pierre-Gilles @VonOx tested with compose and works without issue. 😄 |
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.
@Pierre-Gilles docker & docker-compose ok
Thanks @magarcia
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.
Looks good to me! Thanks for this PR and for your work 🙏
@magarcia Did you manage to install Gladys on M1 chip ? I can help if needed :) |
@all-contributors please add @magarcia for code |
I've put up a pull request to add @magarcia! 🎉 |
Job #732: Bundle Size — 7MiB (0%).
Metrics (no changes)
Total size by type (no changes)
|
@magarcia Fix is live in latest version of Gladys! https://github.com/GladysAssistant/Gladys/releases/tag/v4.12.2 |
Pull Request check-list
To ensure your Pull Request can be accepted as fast as possible, make sure to review and check all of these items:
npm test
on both front/server)npm run eslint
on both front/server)npm run prettier
on both front/server)npm run compare-translations
on front)front/src/config/demo.js
) so that the demo website is working without a backend? (if needed) See https://demo.gladysassistant.com.NOTE: these things are not required to open a PR and can be done afterwards / while the PR is open.
Description of change
This PR fixes #1647, when
/proc/self/cgroup
doesn't contain the container ID it tries to get it from/proc/self/mountinfo
.