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

Define a base Docker image and config-engine docker image based on Debian Stretch #2076

Merged
merged 4 commits into from
Jan 31, 2019
Merged

Define a base Docker image and config-engine docker image based on Debian Stretch #2076

merged 4 commits into from
Jan 31, 2019

Conversation

jleveque
Copy link
Contributor

No description provided.

RUN apt-get -y install \
less \
perl \
procps \
Copy link
Collaborator

Choose a reason for hiding this comment

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

this is newly added compare with jessie, why?

Copy link
Contributor Author

@jleveque jleveque Sep 25, 2018

Choose a reason for hiding this comment

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

I added this because I found the ps command was missing from the default Stretch base Docker image. I guess it had to be installed by default in the Jessie image, but I find it odd, because other people have mentioned that it was not installed by default in the Wheezy image. I find it surprising that it would have been added in Jessie and removed again in Stretch, but that's what appears to have happened.

Copy link
Collaborator

Choose a reason for hiding this comment

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

ok, i am fine.

RUN apt-get update

# Dependencies for sonic-cfggen
RUN apt-get install -y python-lxml python-yaml python-bitarray python-pip python-dev python-natsort python-setuptools
Copy link
Collaborator

Choose a reason for hiding this comment

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

python-setuptools is newly added, why?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Without this, the installation of Python packages later in the file would fail. I think we could safely remove it during cleanup at the end of the file. I'm not quite sure what was different about the Jessie base Docker image that prevented the need for this package.

DOCKER_BASE_STRETCH = docker-base-stretch.gz
$(DOCKER_BASE_STRETCH)_PATH = $(DOCKERS_PATH)/docker-base-stretch
$(DOCKER_BASE_STRETCH)_DEPENDS += $(SUPERVISOR)
$(DOCKER_BASE_STRETCH)_DEPENDS += $(SOCAT)
Copy link
Collaborator

Choose a reason for hiding this comment

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

for socat, do we need to compile stretch version of socat?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We already are. We are currently building socat v1.7.3.1, which is the current latest version available for Stretch. The version currently available for Jessie is 1.7.2.4.

Copy link
Collaborator

Choose a reason for hiding this comment

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

i mean compile the socat in stretch docker.

Copy link
Collaborator

@lguohan lguohan left a comment

Choose a reason for hiding this comment

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

socat installed in stretch docker needs to be compiled in stretch build docker.

@lguohan
Copy link
Collaborator

lguohan commented Jan 29, 2019

retest this please

@lguohan lguohan merged commit 3f138e8 into sonic-net:master Jan 31, 2019
@jleveque jleveque deleted the stretch_docker branch January 31, 2019 18:37
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Nov 30, 2022
… advance submodule heads

utilities:
* 0157086 2022-11-22 | [VXLAN]Fixing traceback in show remotemac when mac moves during command execution (sonic-net#2506) [Sudharsan Dhamal Gopalarathnam]
* 1f26c8c 2022-11-17 | avoid printing error if no neighbors are present (sonic-net#2502) [arlakshm]
* 2573aae 2022-11-19 | [sfp] Fix issue: Application Advertisement is not well formatted (sonic-net#2491) [Junchao-Mellanox]
* 1d96b55 2022-11-10 | [show][muxcable] Catch port Value error exception (sonic-net#2076) (sonic-net#2486) [Isabella de Leon]
* 6ed2afb 2022-11-09 | bugfix[2024] vnet route check exit code fix. (sonic-net#2480) [siqbal1986]
* d8c49dc 2022-11-17 | Fixed SONIC_CLI_IFACE_MODE=alias show ip|ipv6 route output in default mode issue (sonic-net#2422) [Marty Y. Lok]
* 166739e 2022-11-11 | Accept 0 for queue and dscp (sonic-net#2494) (github/202205) [bingwang-ms]

swss:
* 7e274a4 2022-11-18 | [Fdbsyncd] Bug Fix for remote MAC move to local MAC and Fix for Static MAC advertisement in EVPN. (sonic-net#2521) (HEAD -> 202205, github/202205) [KISHORE KUNAL]
* 434e80c 2022-11-02 | Fix vs test issue: failed to remove vlan due to referenced by vlan interface (sonic-net#2504) [Stephen Sun]
* 11bef87 2022-11-27 | [dual-tor] add missing SAI attribte in order to create IPNIP tunnel (sonic-net#2503) [Andriy Yurkiv]
* 11aba29 2022-11-09 | [SWSS] Innovium platform specific changes in PFC Detect lua script (sonic-net#2493) [maulik_patel_marvell]
* 4a165ee 2022-11-14 | Revert "[vlanmgr] Disable `arp_evict_nocarrier` for vlan host intf (sonic-net#2469)" (sonic-net#2518) [Longxiang Lyu]

sairedis:
* 98def2d 2022-11-16 | [Recorder]: Acquire lock for ofstream changes (sonic-net#1145) (HEAD -> 202205, github/202205) [Lawrence Lee]

platform-daemon:
* 9983106 2022-11-15 | [chassisd] update chassisd to write fabric and lc asics on sep erate table (sonic-net#311) (HEAD -> 202205) [arlakshm]
* 8324c26 2022-11-10 | [ycabled] fix exception-handling logic for ycabled (sonic-net#306) [vdahiya12]
* eaf73f8 2022-11-07 | [ycabled] move swsscommon API's from subroutines to call them exactly once per task_worker/thread (sonic-net#303) [vdahiya12]

platform-common:
* 4b528a0 2022-11-21 | Add missing PM and VDM related EEPROM read (sonic-net#326) (HEAD -> 202205) [mihirpat1]
* 8ca6c17 2022-11-14 | Initial commit (sonic-net#323) [mihirpat1]
* 47f87d9 2022-11-23 | EEPROM/DOM Info: The Compliance Code will show "unknown" by using FINISAR 10G LR XCVR (sonic-net#319) [ChiouRung Haung]
* 6273850 2022-06-01 | [ssd_generic] Fix innodisk health regex (sonic-net#287) [Alexander Allen]

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
yxieca added a commit that referenced this pull request Nov 30, 2022
utilities:
* 4b7335f 2022-11-29 | Add db_migrator_constants.py script to setup.py (#2534) (HEAD -> 202205) [Vaibhav Hemant Dixit]
* 8a78cf4 2022-11-23 | Port 202012 DB migration changes to newer branches (#2515) (HEAD -> 202205) [Vaibhav Hemant Dixit]
* 0157086 2022-11-22 | [VXLAN]Fixing traceback in show remotemac when mac moves during command execution (#2506) [Sudharsan Dhamal Gopalarathnam]
* 1f26c8c 2022-11-17 | avoid printing error if no neighbors are present (#2502) [arlakshm]
* 2573aae 2022-11-19 | [sfp] Fix issue: Application Advertisement is not well formatted (#2491) [Junchao-Mellanox]
* 1d96b55 2022-11-10 | [show][muxcable] Catch port Value error exception (#2076) (#2486) [Isabella de Leon]
* 6ed2afb 2022-11-09 | bugfix[2024] vnet route check exit code fix. (#2480) [siqbal1986]
* d8c49dc 2022-11-17 | Fixed SONIC_CLI_IFACE_MODE=alias show ip|ipv6 route output in default mode issue (#2422) [Marty Y. Lok]
* 166739e 2022-11-11 | Accept 0 for queue and dscp (#2494) (github/202205) [bingwang-ms]

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

Signed-off-by: Ying Xie <ying.xie@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.

2 participants