Skip to content

[docker-engine]: upgrade docker engine to 18.09#2417

Merged
lguohan merged 2 commits intosonic-net:masterfrom
lguohan:docker
Jan 5, 2019
Merged

[docker-engine]: upgrade docker engine to 18.09#2417
lguohan merged 2 commits intosonic-net:masterfrom
lguohan:docker

Conversation

@lguohan
Copy link
Collaborator

@lguohan lguohan commented Jan 4, 2019

- What I did
upgrade docker engine to 18.09

- How I did it
download 18.09 and installed.

- How to verify it
Build the image and load into DUT.

admin@str-s6000-on-4:~$ docker version
Client:
 Version:           18.09.0
 API version:       1.39
 Go version:        go1.10.4
 Git commit:        4d60db4
 Built:             Wed Nov  7 00:48:46 2018
 OS/Arch:           linux/amd64
 Experimental:      false

Server: Docker Engine - Community
 Engine:
  Version:          18.09.0
  API version:      1.39 (minimum version 1.12)
  Go version:       go1.10.4
  Git commit:       4d60db4
  Built:            Wed Nov  7 00:16:44 2018
  OS/Arch:          linux/amd64
  Experimental:     false
admin@str-s6000-on-4:~$ docker ps
CONTAINER ID        IMAGE                             COMMAND                  CREATED             STATUS              PORTS               NAMES
0c409d9628b9        docker-snmp-sv2:latest            "/usr/bin/supervisord"   55 seconds ago      Up 54 seconds                           snmp
6f34a5de4d03        docker-syncd-brcm:latest          "/usr/bin/supervisord"   3 minutes ago       Up 3 minutes                            syncd
7c4b64992a20        docker-orchagent-brcm:latest      "/usr/bin/supervisord"   3 minutes ago       Up 3 minutes                            swss
fde291d4a8d8        docker-router-advertiser:latest   "/usr/bin/supervisord"   3 minutes ago       Up 3 minutes                            radv
ec89762640a8        docker-dhcp-relay:latest          "/usr/bin/docker_ini…"   3 minutes ago       Up 3 minutes                            dhcp_relay
ac519bc4d6cf        docker-lldp-sv2:latest            "/usr/bin/supervisord"   3 minutes ago       Up 3 minutes                            lldp
940135969cae        docker-teamd:latest               "/usr/bin/supervisord"   3 minutes ago       Up 3 minutes                            teamd
40c966c2604e        docker-platform-monitor:latest    "/usr/bin/supervisord"   3 minutes ago       Up 3 minutes                            pmon
9936b3986652        docker-fpm-quagga:latest          "/usr/bin/supervisord"   3 minutes ago       Up 3 minutes                            bgp
e7130e40bce0        docker-database:latest            "/usr/bin/supervisord"   12 minutes ago      Up 4 minutes                            database
admin@str-s6000-on-4:~$ 

- Description for the changelog

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

@lguohan lguohan requested a review from yxieca January 4, 2019 18:20
Copy link
Collaborator

@zhenggen-xu zhenggen-xu left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@lguohan lguohan merged commit b57a376 into sonic-net:master Jan 5, 2019
@lguohan lguohan deleted the docker branch January 5, 2019 04:47
stepanblyschak added a commit to stepanblyschak/sonic-buildimage that referenced this pull request Oct 5, 2022
```
99425a8 (HEAD -> 202205, origin/202205) [actions] Support Semgrep by Github Actions (sonic-net#2417)
f41e4d1 Fix for show vxlan tunnel command display issue sonic-net#11902 (sonic-net#2391)
e1d827e [VxLAN]Fix Vxlan delete command to throw error when there are references (sonic-net#2404)
d77acf8 [doc] add documentation on automatic techsupport based on memory (sonic-net#2411)
2cfc75a [doc] update "config feature" section with "--block" option (sonic-net#2409)
9dc8471 [Vxlanmgrd] [CPA] Update the vxlan_tunnel name len to be under IFNAMIZ to overcome netdev creation failure (sonic-net#2398)
342589e Added cisco config platform commands (sonic-net#2242) (sonic-net#2418)
be7da6b [sonic-installer] use host docker startup arguments when running dockerd in chroot (sonic-net#2179) (sonic-net#2407)
d112f7c [202205][auto-ts] add memory check (sonic-net#2116) (sonic-net#2413)
```

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Oct 6, 2022
linkmgrd:
* a5ac7f6 2022-10-05 | [Active-Active] Post link prober stats to state db  (sonic-net#140) (HEAD -> 202205, github/202205) [Jing Zhang]
* f4b0e53 2022-10-05 | [Active-Active] Retry config mux mode standby (sonic-net#139) [Jing Zhang]

utilities:
* a255838 2022-10-04 | [minigraph] new workflow for golden path (sonic-net#2396) (HEAD -> 202205, github/202205) [jingwenxie]
* 99425a8 2022-10-03 | [actions] Support Semgrep by Github Actions (sonic-net#2417) [Mai Bui]
* f41e4d1 2022-09-30 | Fix for show vxlan tunnel command display issue sonic-net#11902 (sonic-net#2391) [Senthil Bhava]
* e1d827e 2022-09-29 | [VxLAN]Fix Vxlan delete command to throw error when there are references (sonic-net#2404) [Sudharsan Dhamal Gopalarathnam]
* d77acf8 2022-09-28 | [doc] add documentation on automatic techsupport based on memory (sonic-net#2411) [Stepan Blyshchak]
* 2cfc75a 2022-09-28 | [doc] update "config feature" section with "--block" option (sonic-net#2409) [Stepan Blyshchak]
* 9dc8471 2022-09-28 | [Vxlanmgrd] [CPA] Update the vxlan_tunnel name len to be under IFNAMIZ to overcome netdev creation failure (sonic-net#2398) [Vivek]
* 342589e 2022-10-03 | Added cisco config platform commands (sonic-net#2242) (sonic-net#2418) [yucgu]

swss:
* 9d9f395 2022-10-04 | [intfmgr]: Enable `accept_untracked_na` kernel param (sonic-net#2436) (HEAD -> 202205, github/202205) [Lawrence Lee]
* 6b6d25d 2022-10-04 |  [orchdaemon]: Fixed sairedis record file rotation (sonic-net#2480) [Bryan Crossland]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
yxieca added a commit that referenced this pull request Oct 6, 2022
linkmgrd:
* a5ac7f6 2022-10-05 | [Active-Active] Post link prober stats to state db  (#140) (HEAD -> 202205, github/202205) [Jing Zhang]
* f4b0e53 2022-10-05 | [Active-Active] Retry config mux mode standby (#139) [Jing Zhang]

utilities:
* a255838 2022-10-04 | [minigraph] new workflow for golden path (#2396) (HEAD -> 202205, github/202205) [jingwenxie]
* 99425a8 2022-10-03 | [actions] Support Semgrep by Github Actions (#2417) [Mai Bui]
* f41e4d1 2022-09-30 | Fix for show vxlan tunnel command display issue #11902 (#2391) [Senthil Bhava]
* e1d827e 2022-09-29 | [VxLAN]Fix Vxlan delete command to throw error when there are references (#2404) [Sudharsan Dhamal Gopalarathnam]
* d77acf8 2022-09-28 | [doc] add documentation on automatic techsupport based on memory (#2411) [Stepan Blyshchak]
* 2cfc75a 2022-09-28 | [doc] update "config feature" section with "--block" option (#2409) [Stepan Blyshchak]
* 9dc8471 2022-09-28 | [Vxlanmgrd] [CPA] Update the vxlan_tunnel name len to be under IFNAMIZ to overcome netdev creation failure (#2398) [Vivek]
* 342589e 2022-10-03 | Added cisco config platform commands (#2242) (#2418) [yucgu]

swss:
* 9d9f395 2022-10-04 | [intfmgr]: Enable `accept_untracked_na` kernel param (#2436) (HEAD -> 202205, github/202205) [Lawrence Lee]
* 6b6d25d 2022-10-04 |  [orchdaemon]: Fixed sairedis record file rotation (#2480) [Bryan Crossland]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
wen587 added a commit to wen587/sonic-buildimage that referenced this pull request Oct 10, 2022
4237794 [muxcable][config] add CLI support for mux mode detach (sonic-net#2425)
a817896 YANG validation for ConfigDB Updates: MGMT_INTERFACE, PORTCHANNEL_MEMBER use cases (sonic-net#2420)
81e2aec [minigraph] new workflow for golden path (sonic-net#2396)
c1206aa ConfigDB Updates with YANG Validation: Include potential for YANG validation even when adhoc validation is used (sonic-net#2412)
57c509a [show] vnet endpoint [ip/ipv6] command (sonic-net#2342)
4b2b766 [actions] Support Semgrep by Github Actions (sonic-net#2417)
156257e check for vxlan mapping before removing vlan (sonic-net#2388)
cb0edd3 Fix for show vxlan tunnel command display issue sonic-net#11902 (sonic-net#2391)
ac71d74 [VxLAN]Fix Vxlan delete command to throw error when there are references (sonic-net#2404)
7419c67 Added cisco config platform commands (sonic-net#2242)
8760bbe Add UT to check sonic installer does not depend on database (sonic-net#2401)
6bef652 [doc] add documentation on automatic techsupport based on memory (sonic-net#2411)
4a78374 [doc] update "config feature" section with "--block" option (sonic-net#2409)
dd6210f [Vxlanmgrd] [CPA] Update the vxlan_tunnel name len to be under IFNAMIZ to overcome netdev creation failure (sonic-net#2398)
bdc4a8a Fix broken pipeline build URL (sonic-net#2363)
b31681b Fix display disorder problem of show vrf  (sonic-net#2392)
123504a YANG validation for ConfigDB Updates: portchannel add/remove, loopback interface, VLAN
28f6820 [link-local]Modify RIF check to include link-local enabled interfaces (sonic-net#2394)
vadymhlushko-mlnx pushed a commit to vadymhlushko-mlnx/sonic-buildimage that referenced this pull request Nov 11, 2022
Signed-off-by: maipbui <maibui@microsoft.com>
#### Why I did it
[Semgrep](https://github.com/returntocorp/semgrep) is a static analysis tool to find security vulnerabilities.
When opening a PR or commtting to PR, Semgrep performs a diff-aware scanning, which scans changed files in PRs.
When merging PR, Semgrep performs a full scan on master branch and report all findings.
Ref: - [Supported Language](https://semgrep.dev/docs/supported-languages/#language-maturity) - [Semgrep Rules](https://registry.semgrep.dev/rule)
#### How I did it
Integrate Semgrep into this repository by committing a job configuration file
#### How to verify it
PR: maipbui#2
Master branch full scan findings: [Master branch findings results](https://github.com/maipbui/sonic-buildimage/actions/runs/3160181876/jobs/5144332404)
PR maipbui#2 scan findings: [Pull request findings results](https://github.com/maipbui/sonic-buildimage/actions/runs/3160193505/jobs/5144357859)
lguohan pushed a commit that referenced this pull request Feb 14, 2026
#25398)

Why I did it
Fix Docker socket activation broken since PR #2417 (January 2019). Docker commands executed before docker.service starts hang indefinitely because -H unix:// breaks systemd socket activation.

Fixes #25383

Work item tracking
Microsoft ADO (number only):
How I did it
Changed -H unix:// to -H fd:// in files/docker/docker.service.conf. Added documentation comments explaining why this flag is required to prevent future regression.

How to verify it
Verified on VS image:

docker.socket is active and triggers docker.service
dockerd runs with -H fd:// flag
Socket activation works correctly

Signed-off-by: Chiranjeevi U <chiranjeevi.uddanti@xoriant.com>
mssonicbld added a commit to mssonicbld/sonic-buildimage that referenced this pull request Feb 14, 2026
#### Why I did it
Fix Docker socket activation broken since PR sonic-net#2417 (January 2019). Docker commands executed before docker.service starts hang indefinitely because -H unix:// breaks systemd socket activation.

**Fixes sonic-net#25383**

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it
Changed `-H unix://` to `-H fd://` in  `files/docker/docker.service.conf`. Added documentation comments explaining why this flag is required to prevent future regression.

#### How to verify it

<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->

Verified on VS image:
- docker.socket is active and triggers docker.service
- dockerd runs with -H fd:// flag
- Socket activation works correctly

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

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [x] 202305
- [x] 202311
- [x] 202405
- [x] 202411
- [x] 202505
- [x] 202511

**Reason:** This is a bug fix that has existed since January 2019. All active release branches are affected and should receive this fix.

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [x] master : `fix_docker-socket-activation-25383.0-b01504e6c` (sonic-vs.img.gz)

#### Description for the changelog

Fix Docker socket activation hang by using -H fd:// instead of -H unix:// in docker.service.conf

<!--
 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
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->
N/A

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

![michael-sum-LEpfefQf4rU-unsplash](https://github.com/user-attachments/assets/a4f71f80-b11c-49f4-a562-26d63b89fdbe)
FengPan-Frank pushed a commit to FengPan-Frank/sonic-buildimage that referenced this pull request Mar 6, 2026
sonic-net#25398)

Why I did it
Fix Docker socket activation broken since PR sonic-net#2417 (January 2019). Docker commands executed before docker.service starts hang indefinitely because -H unix:// breaks systemd socket activation.

Fixes sonic-net#25383

Work item tracking
Microsoft ADO (number only):
How I did it
Changed -H unix:// to -H fd:// in files/docker/docker.service.conf. Added documentation comments explaining why this flag is required to prevent future regression.

How to verify it
Verified on VS image:

docker.socket is active and triggers docker.service
dockerd runs with -H fd:// flag
Socket activation works correctly

Signed-off-by: Chiranjeevi U <chiranjeevi.uddanti@xoriant.com>
Signed-off-by: Feng Pan <fenpan@microsoft.com>
mssonicbld added a commit that referenced this pull request Mar 12, 2026
…5503)

#### Why I did it
Fix Docker socket activation broken since PR #2417 (January 2019). Docker commands executed before docker.service starts hang indefinitely because -H unix:// breaks systemd socket activation.

**Fixes #25383**

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it
Changed `-H unix://` to `-H fd://` in `files/docker/docker.service.conf`. Added documentation comments explaining why this flag is required to prevent future regression.

#### How to verify it

<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->

Verified on VS image:
- docker.socket is active and triggers docker.service
- dockerd runs with -H fd:// flag
- Socket activation works correctly

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

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [x] 202305
- [x] 202311
- [x] 202405
- [x] 202411
- [x] 202505
- [x] 202511

**Reason:** This is a bug fix that has existed since January 2019. All active release branches are affected and should receive this fix.

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [x] master : `fix_docker-socket-activation-25383.0-b01504e6c` (sonic-vs.img.gz)

#### Description for the changelog

Fix Docker socket activation hang by using -H fd:// instead of -H unix:// in docker.service.conf

<!--
 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
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->
N/A

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

![michael-sum-LEpfefQf4rU-unsplash](https://github.com/user-attachments/assets/a4f71f80-b11c-49f4-a562-26d63b89fdbe)
dprital pushed a commit that referenced this pull request Mar 19, 2026
#25398)

Why I did it
Fix Docker socket activation broken since PR #2417 (January 2019). Docker commands executed before docker.service starts hang indefinitely because -H unix:// breaks systemd socket activation.

Fixes #25383

Work item tracking
Microsoft ADO (number only):
How I did it
Changed -H unix:// to -H fd:// in files/docker/docker.service.conf. Added documentation comments explaining why this flag is required to prevent future regression.

How to verify it
Verified on VS image:

docker.socket is active and triggers docker.service
dockerd runs with -H fd:// flag
Socket activation works correctly

Signed-off-by: Chiranjeevi U <chiranjeevi.uddanti@xoriant.com>
Signed-off-by: dprital <drorp@nvidia.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.

4 participants