Skip to content

[build] Use DEFAULT_CONTAINER_REGISTRY in Makefile.work instead of dockerhub. (#19445)#19598

Merged
StormLiangMS merged 1 commit intosonic-net:202305from
liushilongbuaa:202305-fixdockerpull
Jul 18, 2024
Merged

[build] Use DEFAULT_CONTAINER_REGISTRY in Makefile.work instead of dockerhub. (#19445)#19598
StormLiangMS merged 1 commit intosonic-net:202305from
liushilongbuaa:202305-fixdockerpull

Conversation

@liushilongbuaa
Copy link
Contributor

@liushilongbuaa liushilongbuaa commented Jul 17, 2024

Why I did it

DEFAULT_CONTAINER_REGISTRY didn't work as expected in some scenario.

Work item tracking
  • Microsoft ADO (number only): 28739327

How I did it

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

How to verify it

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211
  • 202305

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

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.
@liushilongbuaa liushilongbuaa marked this pull request as ready for review July 17, 2024 06:06
@liushilongbuaa liushilongbuaa changed the title [build] Use Default_container_registry instead of docker.io when pulling docker. (#19445) [build] Use DEFAULT_CONTAINER_REGISTRY in Makefile.work instead of dockerhub. (#19445) Jul 17, 2024
Copy link
Collaborator

@xumia xumia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@k-v1
Copy link
Contributor

k-v1 commented Jul 17, 2024

@liushilongbuaa
Copy link
Contributor Author

FYI:

We also pull from dockerhub here: https://github.com/sonic-net/sonic-swss/blob/43ac585cf0634d1bc27d28637c6db7069460ee25/tests/conftest.py#L379

dockerhub has a request limit. Reducing pull request in Makefile will make swss pull request success.

@StormLiangMS StormLiangMS merged commit 553ae45 into sonic-net:202305 Jul 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants