Sync with docker acap #63
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
deepikas20
reviewed
Mar 21, 2024
deepikas20
reviewed
Mar 22, 2024
* Package settings in a struct and reduce code duplication
* Check filesystem on subfolder instead of top folder * Create folder before checking the filesystem
The default value of /var/run/dockerd, on a tmpfs, is a much better place for the execution state, that on a flash drive.
Since 'error' is not passed in to setup_axparameter(), it will not be set in case setup_axparameter() fails. However, it wasn't possible to get setup_axparameter() to fail. Both ax_parameter_new() and ax_parameter_register_callback() are apparently valid to call even with a non-existing application name.
This restores functionality in commit 774fbf62d726741ad33907c352ac70559b01b358.
* Remove handling of unknown parameters in callback Callbacks from unknown parameters isn't something that happens, and if it did, it wouldn't be a big deal anyway. Removing is a step towards removing global variable 'restart_dockerd'.
* Centralize restart of dockerd By running g_main_loop_run() in a while-loop, other parts of the program can retry starting dockerd by simply calling g_main_loop_quit(). To exit this loop, call quit_program(), which will also set the global acap_exit_code variable. This is needed then e.g. axstorage is used to wait for SD card to become available. --------- Co-authored-by: Madelen Andersson <madelen.andersson@axis.com>
* bump Docker Engine to 26.0.0 and Docker Compose to 2.25.0 --------- Co-authored-by: madelen-at-work <madelen-at-work@users.noreply.github.com>
* Add a new parameter to have an option to choose TCP socket creation --------- Co-authored-by: Madelen Andersson <madelen.andersson@axis.com>
* Pass around data root in settings struct --------- Co-authored-by: madelen-at-work <madelen-at-work@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe your changes
Multiple commits to sync the status of this repo to the docker-acap repo
(Some tweaks made for the changes to be valid for this repo)
Checklist before requesting a review