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.

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

Fix docker load image tag not being the expected tag #12959

Merged
merged 1 commit into from
Dec 7, 2022

Conversation

saiarcot895
Copy link
Contributor

PR #12829 modified the docker tagging scheme such that optional docker containers would be tagged with the SONiC image version. However, the docker-image-load macro wasn't updated for these changes. Update it here.

Signed-off-by: Saikrishna Arcot sarcot@microsoft.com

Why I did it

How I did it

How to verify it

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

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

Description for the changelog

Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.

Link to config_db schema for YANG module changes

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

PR sonic-net#12829 modified the docker tagging scheme such that optional docker
containers would be tagged with the SONiC image version. However, the
docker-image-load macro wasn't updated for these changes. Update it
here.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
@liushilongbuaa
Copy link
Contributor

Hi @saiarcot895, do you know why only docker-dhcp-relay and docker-macsec are added in SONIC_PACKAGES_LOCAL?

./rules/docker-dhcp-relay.mk:43:SONIC_PACKAGES_LOCAL += $(DOCKER_DHCP_RELAY)
./rules/docker-macsec.mk:34:SONIC_PACKAGES_LOCAL += $(DOCKER_MACSEC)

@liushilongbuaa
Copy link
Contributor

@saiarcot895 It seems that 202205 didn't need this PR. 202211 needs it.

@saiarcot895
Copy link
Contributor Author

saiarcot895 commented Dec 6, 2022

Hi @saiarcot895, do you know why only docker-dhcp-relay and docker-macsec are added in SONIC_PACKAGES_LOCAL?

./rules/docker-dhcp-relay.mk:43:SONIC_PACKAGES_LOCAL += $(DOCKER_DHCP_RELAY)
./rules/docker-macsec.mk:34:SONIC_PACKAGES_LOCAL += $(DOCKER_MACSEC)

It's part of application extension images. The idea is that these docker containers (and probably some others, just that they aren't supported yet) can be individually installed or upgraded to newer versions.

@saiarcot895 It seems that 202205 didn't need this PR. 202211 needs it.

Oh that's odd, the PR is marked as being in 202205, I'll recheck tomorrow.

@lguohan lguohan merged commit 6153602 into sonic-net:master Dec 7, 2022
mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Dec 8, 2022
…net#12959)

PR sonic-net#12829 modified the docker tagging scheme such that optional docker
containers would be tagged with the SONiC image version. However, the
docker-image-load macro wasn't updated for these changes. Update it
here.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202205: #13002

mssonicbld pushed a commit that referenced this pull request Dec 9, 2022
PR #12829 modified the docker tagging scheme such that optional docker
containers would be tagged with the SONiC image version. However, the
docker-image-load macro wasn't updated for these changes. Update it
here.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Dec 14, 2022
…net#12959)

PR sonic-net#12829 modified the docker tagging scheme such that optional docker
containers would be tagged with the SONiC image version. However, the
docker-image-load macro wasn't updated for these changes. Update it
here.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202211: #13045

mssonicbld pushed a commit that referenced this pull request Dec 14, 2022
PR #12829 modified the docker tagging scheme such that optional docker
containers would be tagged with the SONiC image version. However, the
docker-image-load macro wasn't updated for these changes. Update it
here.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants