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

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205 #416

Merged
merged 5 commits into from
Jul 14, 2024
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205 #416

merged 5 commits into from
Jul 14, 2024

Commits on Jul 13, 2024

  1. [202205, build] When check for docker arch, use DEFAULT_CONTAINER_REG… 

    …ISTRY if it is not null (#19466) (#19565)

Why I did it
DEFAULT_CONTAINER_REGISTRY didn't work as expected in some scenario.

How I did it
When check for docker arch, use DEFAULT_CONTAINER_REGISTRY if it is not null.

Co-authored-by: Liu Shilong <shilongliu@microsoft.com>
    @yxieca @liushilongbuaa
    yxieca and liushilongbuaa authored Jul 13, 2024
    Configuration menu
    Copy the full SHA
    2b63559 View commit details
    Browse the repository at this point in the history

  2. [submodule] Update submodule sonic-utilities to the latest HEAD autom… 

    …atically (#19224)

src/sonic-utilities

* 8e71e656 - (HEAD -> 202205, origin/202205) [build] Fix base OS compilation issue caused by incompatibility between urllib3 and requests packages (#3328) (#3355) (5 weeks ago) [Volodymyr Samotiy]
    @mssonicbld
    mssonicbld authored Jul 13, 2024
    Configuration menu
    Copy the full SHA
    ee5507c View commit details
    Browse the repository at this point in the history

  3. [submodule] Update submodule sonic-platform-daemons to the latest HEA… 

    …D automatically (#18744)

src/sonic-platform-daemons

* dee5310 - (HEAD -> 202205, origin/202205) [ci] Fix 202205 pipeline issue. (#474) (3 months ago) [Liu Shilong]
    @mssonicbld
    mssonicbld authored Jul 13, 2024
    Configuration menu
    Copy the full SHA
    2ceacd4 View commit details
    Browse the repository at this point in the history

  4. [ci/build]: Upgrade SONiC package versions (#17918)

    @mssonicbld
    mssonicbld authored Jul 13, 2024
    Configuration menu
    Copy the full SHA
    9556367 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. Merge branch '202205' of https://github.com/sonic-net/sonic-buildimage … 

    …into 202205
    @mssonicbld
    mssonicbld committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    252faa2 View commit details
    Browse the repository at this point in the history