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.

Sign up for GitHub

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

[docker-teamd]: rename docker-team to docker-teamd #174

Merged
merged 1 commit into from
Dec 30, 2016
Merged

[docker-teamd]: rename docker-team to docker-teamd #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dockers/docker-team/Dockerfile.j2 → dockers/docker-teamd/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -f -y libdbus-1-3 libdaemon0 libjansson4
COPY debs /debs

RUN dpkg -i \
{% for deb in docker_team_debs.split(' ') -%}
{% for deb in docker_teamd_debs.split(' ') -%}
debs/{{ deb }}{{' '}}
{%- endfor %}

Expand Down
0 dockers/docker-team/start.sh → dockers/docker-teamd/start.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion platform/generic/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SONIC_ALL += $(DOCKER_DATABASE) \
$(DOCKER_FPM) \
$(DOCKER_TEAM) \
$(DOCKER_TEAMD) \
$(DOCKER_LLDP_SV2) \
$(DOCKER_SNMP_SV2) \
$(DOCKER_PLATFORM_MONITOR)
2 changes: 1 addition & 1 deletion platform/mellanox/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SONIC_ALL += $(DOCKER_SYNCD_MLNX) \
$(DOCKER_DATABASE) \
$(DOCKER_LLDP_SV2) \
$(DOCKER_SNMP_SV2) \
$(DOCKER_TEAM) \
$(DOCKER_TEAMD) \
$(DOCKER_PLATFORM_MONITOR) \
debs/$(MLNX_HW_MANAGEMENT) \
debs/$(SX_KERNEL)
Expand Down
7 changes: 0 additions & 7 deletions rules/docker-team.mk
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions rules/docker-teamd.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# docker image for teamd agent

DOCKER_TEAMD = docker-teamd.gz
$(DOCKER_TEAMD)_PATH = $(DOCKERS_PATH)/docker-teamd
$(DOCKER_TEAMD)_DEPENDS += $(SWSS) $(LIBTEAMDCT) $(LIBTEAM_UTILS)
$(DOCKER_TEAMD)_LOAD_DOCKERS += $(DOCKER_BASE)
SONIC_DOCKER_IMAGES += $(DOCKER_TEAMD)