Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Sync with latest-edge (latest-candidate) #639

Merged
merged 8 commits into from
Nov 27, 2024
Merged

Sync with latest-edge (latest-candidate) #639

merged 8 commits into from
Nov 27, 2024

Commits on Nov 27, 2024

  1. dqlite: Cherry-pick segfault fix 

    Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
    @tomponline
    tomponline committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    c547dde View commit details
    Browse the repository at this point in the history

  2. github: use Go version from go.mod 

    Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
(cherry picked from commit 136d7fe)
    @simondeziel @tomponline
    simondeziel authored and tomponline committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    bb98967 View commit details
    Browse the repository at this point in the history

  3. github: reorder build job to have custom actions last 

    Signed-off-by: Simon Deziel <simon.deziel@canonical.com>
(cherry picked from commit cb9d5d2)
    @simondeziel @tomponline
    simondeziel authored and tomponline committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    ef94229 View commit details
    Browse the repository at this point in the history

  4. lxd: Build lxd server binary into /sbin 

        The PATH inside the snap is configured to prefer /sbin over /bin so the lxd binary will still
    be called by default.

    The lxd-stophook-wrapper script which will be placed into `/bin/lxd`.

    Because containers are configured to call `/snap/lxd/current/bin/lxd callhook` which in turn will be
    routed to `/snap/lxd/current/bin/lxd-user` by the lxd-stophook-wrapper script, which will then connect
    to LXD's unix socket to indicate to the server that the container is stopping.

    Because lxd-user is compiled as a static binary this will work across snap core base changes.

    Also update LXD_EXEC_PATH env var so that LXD will still directly execute itself when needed, rather
    than going via the lxd-stophook wrapper script.

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
(cherry picked from commit 75de117)
(cherry picked from commit 74e8bc7)
    @tomponline
    tomponline committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    2419b14 View commit details
    Browse the repository at this point in the history

  5. lxd-stophook: Adds stop hook wrapper for the lxd command 

    This command is intended to replace the `lxd` command in the snap so that
existing running containers that are stopping will call this script as part of
their stop hooks.

This will then "route" the command to the `lxd-user` command that will be
statically compiled so that it can connect to the running LXD daemon via
the unix socket to indicate the container is stopping, even after refreshing
the LXD snap to a different core base snap.

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
(cherry picked from commit 4d10cbd)
(cherry picked from commit d037e01)
    @tomponline
    tomponline committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    65fdfd4 View commit details
    Browse the repository at this point in the history

  6. github: Use stable go version for triggering snap build 

    Reverts breakage introduced by 136d7fe

Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
(cherry picked from commit d0f1495)
    @tomponline
    tomponline committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    3340018 View commit details
    Browse the repository at this point in the history

  7. snapcraft: Adds title field 

    Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
(cherry picked from commit c0b8a0d)
    @tomponline
    tomponline committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    94ad1d9 View commit details
    Browse the repository at this point in the history

  8. lxd: Bump to pre LXD 6.2 

    Signed-off-by: Thomas Parrott <thomas.parrott@canonical.com>
    @tomponline
    tomponline committed Nov 27, 2024
    Configuration menu
    Copy the full SHA
    325779a View commit details
    Browse the repository at this point in the history