matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build errors in branch 201712 (#1775)

Browse Source 
* Fix links of debian git server (#1755)

* [dockers] Prevent apt-get from installing suggested and recommended packages by default (#1666)

* [cfggen]: Fix build by fixing pyangbind version (#1633)

* [Ingrasys] Add platform support for S9280-64X with Barefoot ASIC

* Revert "[Ingrasys] Add platform support for S9280-64X with Barefoot ASIC"

This reverts commit 29b9d904f6.

Separate S9280-64X platform driver files into a new PR
This commit is contained in:
Jason Tsai 2018-06-10 02:22:28 +08:00 committed by lguohan
parent 4b27ce0e73
commit 6453b3ac1b
16 changed files with 130 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dockers/docker-base/Dockerfile.j2
View File

@ -18,8 +18,9 @@ RUN rm -rf \
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
# Configure data sources for apt/dpkg # Configure data sources for apt/dpkg
COPY ["sources.list", "/etc/apt/sources.list"]
COPY ["dpkg_01_drop", "/etc/dpkg/dpkg.cfg.d/01_drop"] COPY ["dpkg_01_drop", "/etc/dpkg/dpkg.cfg.d/01_drop"]
COPY ["sources.list", "/etc/apt/sources.list"]
COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"]
RUN apt-get update RUN apt-get update
# Pre-install fundamental packages # Pre-install fundamental packages

5
dockers/docker-base/no_install_recommend_suggest Normal file
View File

@ -0,0 +1,5 @@
# Instruct apt-get to NOT install "recommended" or "suggested" packages by
# default when installing a package.
APT::Install-Recommends "false";
APT::Install-Suggests "false";

44
dockers/docker-database/Dockerfile.j2
View File

@ -1,34 +1,34 @@
FROM docker-config-engine FROM docker-config-engine
## Make apt-get non-interactive # Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
# Update apt's cache of available packages
RUN apt-get update RUN apt-get update
COPY \ {% if docker_database_debs.strip() -%}
{% for deb in docker_database_debs.split(' ') -%} # Copy locally-built Debian package dependencies
debs/{{ deb }}{{' '}} {%- for deb in docker_database_debs.split(' ') %}
{%- endfor -%} COPY debs/{{ deb }} /debs/
debs/
## Install redis-tools dependencies
## TODO: implicitly install dependencies
RUN apt-get -y install libjemalloc1
RUN dpkg -i \
{% for deb in docker_database_debs.split(' ') -%}
debs/{{ deb }}{{' '}}
{%- endfor %} {%- endfor %}
## Clean up # Install locally-built Debian packages and implicitly install their dependencies
RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y {%- for deb in docker_database_debs.split(' ') %}
RUN rm -rf /debs RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; dpkg_apt /debs/{{ deb }}
{%- endfor %}
{%- endif %}
RUN sed -ri 's/^(save .*$)/# \1/g; \ # Clean up
s/^daemonize yes$/daemonize no/; \ RUN apt-get clean -y
s/^logfile .*$/logfile ""/; \ RUN apt-get autoclean -y
s/^# syslog-enabled no$/syslog-enabled no/; \ RUN apt-get autoremove -y
s/^# unixsocket/unixsocket/; \ RUN rm -rf /debs ~/.cache
RUN sed -ri 's/^(save .*$)/# \1/g; \
s/^daemonize yes$/daemonize no/; \
s/^logfile .*$/logfile ""/; \
s/^# syslog-enabled no$/syslog-enabled no/; \
s/^# unixsocket/unixsocket/; \
s/^client-output-buffer-limit pubsub [0-9]+mb [0-9]+mb [0-9]+/client-output-buffer-limit pubsub 0 0 0/ \ s/^client-output-buffer-limit pubsub [0-9]+mb [0-9]+mb [0-9]+/client-output-buffer-limit pubsub 0 0 0/ \
' /etc/redis/redis.conf ' /etc/redis/redis.conf

33
dockers/docker-fpm-quagga/Dockerfile.j2
View File

@ -1,26 +1,31 @@
FROM docker-config-engine FROM docker-config-engine
## Make apt-get non-interactive # Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
# Update apt's cache of available packages
RUN apt-get update RUN apt-get update
RUN apt-get install -y libdbus-1-3 libdaemon0 libjansson4 # Install required packages
RUN apt-get install -y libdbus-1-3 libdaemon0 libjansson4
COPY \ {% if docker_fpm_quagga_debs.strip() -%}
{% for deb in docker_fpm_quagga_debs.split(' ') -%} # Copy locally-built Debian package dependencies
debs/{{ deb }}{{' '}} {%- for deb in docker_fpm_quagga_debs.split(' ') %}
{%- endfor -%} COPY debs/{{ deb }} /debs/
debs/
RUN dpkg -i \
{% for deb in docker_fpm_quagga_debs.split(' ') -%}
debs/{{ deb }}{{' '}}
{%- endfor %} {%- endfor %}
## Clean up # Install locally-built Debian packages and implicitly install their dependencies
RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y {%- for deb in docker_fpm_quagga_debs.split(' ') %}
RUN rm -rf /debs RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; dpkg_apt /debs/{{ deb }}
{%- endfor %}
{%- endif %}
# Clean up
RUN apt-get clean -y
RUN apt-get autoclean -y
RUN apt-get autoremove -y
RUN rm -rf /debs ~/.cache
COPY ["bgpcfgd", "start.sh", "/usr/bin/"] COPY ["bgpcfgd", "start.sh", "/usr/bin/"]
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]

84
dockers/docker-snmp-sv2/Dockerfile.j2
View File

@ -1,50 +1,62 @@
FROM docker-config-engine FROM docker-config-engine
COPY [ \ # Enable -O for all Python calls
{% for deb in docker_snmp_sv2_debs.split(' ') -%}
"debs/{{ deb }}",
{%- endfor %} \
"/debs/"]
# Install Python SwSSSDK (SNMP subagent dependency)
COPY python-wheels/sonic_utilities-*-py3-*.whl /python-wheels/
COPY python-wheels/swsssdk-*-py3-*.whl /python-wheels/
COPY python-wheels/asyncsnmp-*-py3-*.whl /python-wheels/
# enable -O for all Python calls
ENV PYTHONOPTIMIZE 1 ENV PYTHONOPTIMIZE 1
## Make apt-get non-interactive # Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
# install libsnmp30 dependencies # Update apt's cache of available packages
# install libpython3.6-dev dependencies RUN apt-get update
# install pip dependencies
# TODO: remove libpython3.6-dev, its and pip's dependencies if we can get pip3 directly # Install curl so we can download and install pip later
# install subagent # Also install major root CA certificates for curl to reference
# clean up RUN apt-get install -y curl ca-certificates
RUN apt-get update && apt-get install -y libperl5.20 libpci3 libwrap0 \
libexpat1-dev \ # Install gcc which is required for installing hiredis
curl gcc && \ RUN apt-get install -y gcc
dpkg -i \
{% for deb in docker_snmp_sv2_debs.split(' ') -%} {% if docker_snmp_sv2_debs.strip() -%}
debs/{{ deb }}{{' '}} # Copy locally-built Debian package dependencies
{%- endfor %} && \ {%- for deb in docker_snmp_sv2_debs.split(' ') %}
rm -rf /debs && \ COPY debs/{{ deb }} /debs/
curl https://bootstrap.pypa.io/get-pip.py | python3.6 && \ {%- endfor %}
python3.6 -m pip install --no-cache-dir /python-wheels/*py3*.whl hiredis && \
rm -rf /python-wheels && \ # Install locally-built Debian packages and implicitly install their dependencies
python3.6 -m sonic_ax_impl install && \ {%- for deb in docker_snmp_sv2_debs.split(' ') %}
apt-get -y purge libpython3.6-dev libexpat1-dev curl gcc && \ RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; dpkg_apt /debs/{{ deb }}
apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y --purge && \ {%- endfor %}
find / | grep -E "__pycache__" | xargs rm -rf && \ {%- endif %}
rm -rf ~/.cache
# Install up-to-date version of pip
RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6
RUN python3.6 -m pip install --no-cache-dir hiredis
{% if docker_snmp_sv2_whls.strip() -%}
# Copy locally-built Python wheel dependencies
{%- for whl in docker_snmp_sv2_whls.split(' ') %}
COPY python-wheels/{{ whl }} /python-wheels/
{%- endfor %}
# Install locally-built Python wheel dependencies
{%- for whl in docker_snmp_sv2_whls.split(' ') %}
RUN pip install /python-wheels/{{ whl }}
{%- endfor %}
{% endif %}
RUN python3.6 -m sonic_ax_impl install
# Clean up
RUN apt-get -y purge libpython3.6-dev curl gcc
RUN apt-get clean -y && apt-get autoclean -y && apt-get autoremove -y --purge
RUN find / | grep -E "__pycache__" | xargs rm -rf
RUN rm -rf /debs /python-wheels ~/.cache
COPY ["start.sh", "/usr/bin/"] COPY ["start.sh", "/usr/bin/"]
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
COPY ["*.j2", "/usr/share/sonic/templates/"] COPY ["*.j2", "/usr/share/sonic/templates/"]
## Although exposing ports is not needed for host net mode, keep it for possible bridge mode # Although exposing ports is not needed for host net mode, keep it for possible bridge mode
EXPOSE 161/udp 162/udp EXPOSE 161/udp 162/udp
ENTRYPOINT ["/usr/bin/supervisord"] ENTRYPOINT ["/usr/bin/supervisord"]

2
platform/p4/docker-sonic-p4.mk
View File

@ -5,8 +5,8 @@ $(DOCKER_SONIC_P4)_PATH = $(PLATFORM_PATH)/docker-sonic-p4
$(DOCKER_SONIC_P4)_DEPENDS += $(SWSS) \ $(DOCKER_SONIC_P4)_DEPENDS += $(SWSS) \
$(SYNCD) \ $(SYNCD) \
$(P4_SWITCH) \ $(P4_SWITCH) \
$(REDIS_SERVER) \
$(REDIS_TOOLS) \ $(REDIS_TOOLS) \
$(REDIS_SERVER) \
$(PYTHON_SWSSCOMMON) \ $(PYTHON_SWSSCOMMON) \
$(LIBTEAMDCT) \ $(LIBTEAMDCT) \
$(LIBTEAM_UTILS) \ $(LIBTEAM_UTILS) \

2
platform/vs/docker-sonic-vs.mk
View File

@ -4,8 +4,8 @@ DOCKER_SONIC_VS = docker-sonic-vs.gz
$(DOCKER_SONIC_VS)_PATH = $(PLATFORM_PATH)/docker-sonic-vs $(DOCKER_SONIC_VS)_PATH = $(PLATFORM_PATH)/docker-sonic-vs
$(DOCKER_SONIC_VS)_DEPENDS += $(SWSS) \ $(DOCKER_SONIC_VS)_DEPENDS += $(SWSS) \
$(SYNCD_VS) \ $(SYNCD_VS) \
$(REDIS_SERVER) \
$(REDIS_TOOLS) \ $(REDIS_TOOLS) \
$(REDIS_SERVER) \
$(PYTHON_SWSSCOMMON) \ $(PYTHON_SWSSCOMMON) \
$(LIBTEAMDCT) \ $(LIBTEAMDCT) \
$(LIBTEAM_UTILS) \ $(LIBTEAM_UTILS) \

27
platform/vs/docker-sonic-vs/Dockerfile.j2
View File

@ -43,20 +43,23 @@ RUN apt-get install -y net-tools \
RUN pip install setuptools RUN pip install setuptools
RUN pip install py2_ipaddress RUN pip install py2_ipaddress
COPY \ {% if docker_sonic_vs_debs.strip() -%}
{% for deb in docker_sonic_vs_debs.split(' ') -%} # Copy locally-built Debian package dependencies
debs/{{ deb }}{{' '}} {%- for deb in docker_sonic_vs_debs.split(' ') %}
{%- endfor -%} COPY debs/{{ deb }} /debs/
debs/
RUN dpkg -i \
{% for deb in docker_sonic_vs_debs.split(' ') -%}
debs/{{ deb }}{{' '}}
{%- endfor %} {%- endfor %}
## Clean up # Install locally-built Debian packages and implicitly install their dependencies
RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y {%- for deb in docker_sonic_vs_debs.split(' ') %}
RUN rm -rf /debs RUN dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; }; dpkg_apt /debs/{{ deb }}
{%- endfor %}
{%- endif %}
# Clean up
RUN apt-get clean -y
RUN apt-get autoclean -y
RUN apt-get autoremove -y
RUN rm -rf /debs ~/.cache
RUN sed -ri 's/^(save .*$)/# \1/g; \ RUN sed -ri 's/^(save .*$)/# \1/g; \
s/^daemonize yes$/daemonize no/; \ s/^daemonize yes$/daemonize no/; \

2
rules/docker-database.mk
View File

@ -2,7 +2,7 @@
DOCKER_DATABASE = docker-database.gz DOCKER_DATABASE = docker-database.gz
$(DOCKER_DATABASE)_PATH = $(DOCKERS_PATH)/docker-database $(DOCKER_DATABASE)_PATH = $(DOCKERS_PATH)/docker-database
$(DOCKER_DATABASE)_DEPENDS += $(REDIS_SERVER) $(REDIS_TOOLS) $(DOCKER_DATABASE)_DEPENDS += $(REDIS_TOOLS) $(REDIS_SERVER)
$(DOCKER_DATABASE)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE) $(DOCKER_DATABASE)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
SONIC_DOCKER_IMAGES += $(DOCKER_DATABASE) SONIC_DOCKER_IMAGES += $(DOCKER_DATABASE)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_DATABASE) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_DATABASE)

2
rules/docker-snmp-sv2.mk
View File

@ -4,7 +4,7 @@ DOCKER_SNMP_SV2 = docker-snmp-sv2.gz
$(DOCKER_SNMP_SV2)_PATH = $(DOCKERS_PATH)/docker-snmp-sv2 $(DOCKER_SNMP_SV2)_PATH = $(DOCKERS_PATH)/docker-snmp-sv2
## TODO: remove LIBPY3_DEV if we can get pip3 directly ## TODO: remove LIBPY3_DEV if we can get pip3 directly
$(DOCKER_SNMP_SV2)_DEPENDS += $(SNMP) $(SNMPD) $(PY3) $(LIBPY3_DEV) $(DOCKER_SNMP_SV2)_DEPENDS += $(SNMP) $(SNMPD) $(PY3) $(LIBPY3_DEV)
$(DOCKER_SNMP_SV2)_PYTHON_WHEELS += $(ASYNCSNMP_PY3) $(DOCKER_SNMP_SV2)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY3) $(SWSSSDK_PY3) $(ASYNCSNMP_PY3)
$(DOCKER_SNMP_SV2)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE) $(DOCKER_SNMP_SV2)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
SONIC_DOCKER_IMAGES += $(DOCKER_SNMP_SV2) SONIC_DOCKER_IMAGES += $(DOCKER_SNMP_SV2)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SNMP_SV2) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SNMP_SV2)

16
sonic-slave/Dockerfile
View File

@ -189,7 +189,6 @@ RUN apt-get update && apt-get install -y \
libjs-sphinxdoc \ libjs-sphinxdoc \
libjs-underscore \ libjs-underscore \
python-docutils \ python-docutils \
python-jinja2 \
python-markupsafe \ python-markupsafe \
python-pygments \ python-pygments \
python-roman \ python-roman \
@ -198,7 +197,6 @@ RUN apt-get update && apt-get install -y \
python3-sphinx \ python3-sphinx \
# For sonic config engine testing # For sonic config engine testing
python-lxml \ python-lxml \
python-jinja2 \
python-netaddr \ python-netaddr \
python-ipaddr \ python-ipaddr \
python-yaml \ python-yaml \
@ -234,16 +232,22 @@ RUN export VERSION=1.8.3 \
&& echo 'export GOROOT=/usr/local/go' >> /etc/bash.bashrc \ && echo 'export GOROOT=/usr/local/go' >> /etc/bash.bashrc \
&& echo 'export PATH=$PATH:$GOROOT/bin' >> /etc/bash.bashrc && echo 'export PATH=$PATH:$GOROOT/bin' >> /etc/bash.bashrc
# Upgrade pip2
# Note: use pip2 specific version so jinja2 2.10 will install
RUN python2 -m pip install -U pip==9.0.3
# For p4 build # For p4 build
RUN pip install \ RUN pip install \
ctypesgen \ ctypesgen \
crc16 crc16
# For templating
RUN pip install j2cli
# For sonic config engine testing # For sonic config engine testing
RUN pip install pyangbind==0.5.10 RUN pip install pyangbind==0.6.0
# Note: force upgrade debian packaged jinja2, if installed
RUN pip install --force-reinstall --upgrade jinja2>=2.10
# For templating (requiring jinja2)
RUN pip install j2cli
# For sonic utilities testing # For sonic utilities testing
RUN pip install click-default-group click natsort tabulate RUN pip install click-default-group click natsort tabulate

2
src/initramfs-tools/Makefile
View File

@ -7,7 +7,7 @@ MAIN_TARGET = initramfs-tools_$(INITRAMFS_TOOLS_VERSION)_all.deb
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Obtaining the initramfs-tools # Obtaining the initramfs-tools
rm -rf ./initramfs-tools rm -rf ./initramfs-tools
git clone --branch v0.120 https://anonscm.debian.org/git/kernel/initramfs-tools.git ./initramfs-tools git clone --branch v0.120 https://salsa.debian.org/kernel-team/initramfs-tools.git ./initramfs-tools
# Patch # Patch
pushd ./initramfs-tools pushd ./initramfs-tools

2
src/isc-dhcp/Makefile
View File

@ -10,7 +10,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
rm -rf ./isc-dhcp rm -rf ./isc-dhcp
# Clone isc-dhcp repo # Clone isc-dhcp repo
git clone https://anonscm.debian.org/cgit/pkg-dhcp/isc-dhcp.git git clone https://salsa.debian.org/berni/isc-dhcp.git
pushd ./isc-dhcp pushd ./isc-dhcp
# Reset HEAD to the commit of the proper tag # Reset HEAD to the commit of the proper tag

2
src/libnl3/Makefile
View File

@ -16,7 +16,7 @@ DERIVED_TARGETS = libnl-3-dev_$(LIBNL3_VERSION)_amd64.deb \
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Obtaining the libnl3 # Obtaining the libnl3
rm -rf ./libnl3 rm -rf ./libnl3
git clone https://anonscm.debian.org/git/collab-maint/libnl3.git git clone https://github.com/qiluo-msft/libnl3.git
pushd ./libnl3 pushd ./libnl3
git checkout -f b77c0e49cb git checkout -f b77c0e49cb

2
src/libteam/Makefile
View File

@ -22,7 +22,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
popd popd
# Obtain debian packaging # Obtain debian packaging
git clone https://anonscm.debian.org/git/collab-maint/libteam.git tmp git clone https://salsa.debian.org/debian/libteam.git tmp
pushd ./tmp pushd ./tmp
git checkout -f da006f2 # v1.26 git checkout -f da006f2 # v1.26
popd popd

2
src/sonic-config-engine/setup.py
View File

@ -17,6 +17,6 @@ setup(name='sonic-config-engine',
url='https://github.com/Azure/sonic-buildimage', url='https://github.com/Azure/sonic-buildimage',
py_modules=['portconfig', 'minigraph', 'openconfig_acl', 'sonic_platform'], py_modules=['portconfig', 'minigraph', 'openconfig_acl', 'sonic_platform'],
scripts=['sonic-cfggen'], scripts=['sonic-cfggen'],
install_requires=['lxml', 'jinja2', 'netaddr', 'ipaddr', 'pyyaml', 'pyangbind'], install_requires=['lxml', 'jinja2>=2.10', 'netaddr', 'ipaddr', 'pyyaml', 'pyangbind==0.6.0'],
test_suite='setup.get_test_suite', test_suite='setup.get_test_suite',
) )