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

[dockers] save extension dockers with an image tag #12829

Merged
merged 1 commit into from
Nov 30, 2022

Conversation

stepanblyschak
Copy link
Collaborator

@stepanblyschak stepanblyschak commented Nov 25, 2022

Signed-off-by: Stepan Blyschak stepanb@nvidia.com

Fixes: #11521

Why I did it

When build SONiC dockers, SONiC build system tags all of them with latest tag. This is Ok for all built-in dockers because we will also tag them with image version tag in sonic_debian_extension.j2 script. On the other hand, some of these dockers are SONiC packages and they are installed by sonic-package-manager which creates a only one tag whcih is recorded in the corresponding .gz file. This leads to having these dockers tagged only with latest tag. This change saves the tag as an image version string in .gz file, so that these dockers have version identification in their tag.

How I did it

I modified slave.mk to save the version tag instead of latest tag.

How to verify it

I verified this change by running show version:

SONiC Software Version: SONiC.HEAD.2016-2998c3f40
Distribution: Debian 11.5
Kernel: 5.10.0-18-2-amd64
Build commit: 2998c3f40
Build date: Thu Nov 24 17:12:09 UTC 2022
Built by: sw-r2d2-bot@r-build-sonic-ci03-241

Platform: x86_64-mlnx_msn4600c-r0
HwSKU: Mellanox-SN4600C-C64
ASIC: mellanox
ASIC Count: 1
Serial Number: MT2023X22082
Model Number: MSN4600-CS2FO
Hardware Revision: A1
Uptime: 10:06:31 up 2 min,  1 user,  load average: 2.48, 1.14, 0.44
Date: Fri 25 Nov 2022 10:06:31

Docker images:
REPOSITORY                    TAG                   IMAGE ID       SIZE
docker-orchagent              HEAD.2016-2998c3f40   760e3ac32730   525MB
docker-orchagent              latest                760e3ac32730   525MB
docker-fpm-frr                HEAD.2016-2998c3f40   a914f8582dff   536MB
docker-fpm-frr                latest                a914f8582dff   536MB
docker-teamd                  HEAD.2016-2998c3f40   23c5bb16ddac   506MB
docker-teamd                  latest                23c5bb16ddac   506MB
docker-macsec                 HEAD.2016-2998c3f40   b04d8bd19248   509MB
docker-syncd-mlnx             HEAD.2016-2998c3f40   6bbf6e4b8a3a   910MB
docker-syncd-mlnx             latest                6bbf6e4b8a3a   910MB
docker-platform-monitor       HEAD.2016-2998c3f40   9bcae580c5b0   917MB
docker-platform-monitor       latest                9bcae580c5b0   917MB
docker-sonic-telemetry        HEAD.2016-2998c3f40   7802fb621402   784MB
docker-sonic-telemetry        latest                7802fb621402   784MB
docker-snmp                   HEAD.2016-2998c3f40   af6493bb9b92   536MB
docker-snmp                   latest                af6493bb9b92   536MB
docker-lldp                   HEAD.2016-2998c3f40   9b098dd5d539   532MB
docker-lldp                   latest                9b098dd5d539   532MB
docker-dhcp-relay             HEAD.2016-2998c3f40   8dd189f905f9   500MB
docker-sonic-p4rt             HEAD.2016-2998c3f40   cecba3819cb3   572MB
docker-sonic-p4rt             latest                cecba3819cb3   572MB
docker-mux                    HEAD.2016-2998c3f40   314b433cdc12   539MB
docker-mux                    latest                314b433cdc12   539MB
docker-database               HEAD.2016-2998c3f40   cf751891dd80   490MB
docker-database               latest                cf751891dd80   490MB
docker-router-advertiser      HEAD.2016-2998c3f40   1c726d4fed44   490MB
docker-router-advertiser      latest                1c726d4fed44   490MB
docker-eventd                 HEAD.2016-2998c3f40   f907d689a556   490MB
docker-eventd                 latest                f907d689a556   490MB
docker-sonic-mgmt-framework   HEAD.2016-2998c3f40   76a2a9a9e6c6   609MB
docker-sonic-mgmt-framework   latest                76a2a9a9e6c6   609MB
docker-nat                    HEAD.2016-2998c3f40   4305aed622f5   478MB
docker-nat                    latest                4305aed622f5   478MB
docker-sflow                  HEAD.2016-2998c3f40   f53036301efb   476MB
docker-sflow                  latest                f53036301efb   476MB

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

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

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)

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
@liat-grozovik
Copy link
Collaborator

@saiarcot895 and @qiluo-msft could you please review and approve?

@liat-grozovik liat-grozovik merged commit d22cf46 into sonic-net:master Nov 30, 2022
mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Dec 5, 2022
Fixes: sonic-net#11521

- Why I did it
When build SONiC dockers, SONiC build system tags all of them with latest tag. This is Ok for all built-in dockers because we will also tag them with image version tag in sonic_debian_extension.j2 script. On the other hand, some of these dockers are SONiC packages and they are installed by sonic-package-manager which creates a only one tag whcih is recorded in the corresponding .gz file. This leads to having these dockers tagged only with latest tag. This change saves the tag as an image version string in .gz file, so that these dockers have version identification in their tag.

- How I did it
I modified slave.mk to save the version tag instead of latest tag.

- How to verify it
I verified this change by running show version

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202205: #12947

saiarcot895 added a commit to saiarcot895/sonic-buildimage that referenced this pull request Dec 6, 2022
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>
lguohan pushed a commit that referenced this pull request Dec 7, 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>
StormLiangMS pushed a commit to StormLiangMS/sonic-buildimage that referenced this pull request Dec 8, 2022
Fixes: sonic-net#11521

- Why I did it
When build SONiC dockers, SONiC build system tags all of them with latest tag. This is Ok for all built-in dockers because we will also tag them with image version tag in sonic_debian_extension.j2 script. On the other hand, some of these dockers are SONiC packages and they are installed by sonic-package-manager which creates a only one tag whcih is recorded in the corresponding .gz file. This leads to having these dockers tagged only with latest tag. This change saves the tag as an image version string in .gz file, so that these dockers have version identification in their tag.

- How I did it
I modified slave.mk to save the version tag instead of latest tag.

- How to verify it
I verified this change by running show version

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
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 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>
StormLiangMS pushed a commit that referenced this pull request Dec 10, 2022
Fixes: #11521

- Why I did it
When build SONiC dockers, SONiC build system tags all of them with latest tag. This is Ok for all built-in dockers because we will also tag them with image version tag in sonic_debian_extension.j2 script. On the other hand, some of these dockers are SONiC packages and they are installed by sonic-package-manager which creates a only one tag whcih is recorded in the corresponding .gz file. This leads to having these dockers tagged only with latest tag. This change saves the tag as an image version string in .gz file, so that these dockers have version identification in their tag.

- How I did it
I modified slave.mk to save the version tag instead of latest tag.

- How to verify it
I verified this change by running show version

Signed-off-by: Stepan Blyschak <stepanb@nvidia.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 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