File tree 3 files changed +4
-12
lines changed
dockers/docker-sonic-mgmt
3 files changed +4
-12
lines changed Original file line number Diff line number Diff line change @@ -210,9 +210,9 @@ RUN mkdir -p /etc/apt/keyrings \
210
210
&& apt-get update && apt-get install -y azure-cli
211
211
212
212
## Copy and install sonic-mgmt docker dependencies
213
- COPY debs/sonic-device-data_*.deb debs/
213
+ COPY debs/sonic-device-data_*.deb debs/libdashapi_*.deb debs/
214
214
215
- RUN dpkg -i debs/sonic-device-data_*.deb
215
+ RUN dpkg -i debs/sonic-device-data_*.deb debs/libdashapi_*.deb
216
216
217
217
# Install protobuf 3.21.12 which is from https://deb.debian.org/debian/pool/main/p/protobuf/protobuf_3.21.12-3.dsc
218
218
RUN mkdir -p /tmp/protobuf \
@@ -227,14 +227,6 @@ RUN mkdir -p /tmp/protobuf \
227
227
&& dpkg -i *.deb \
228
228
&& rm -rf /tmp/protobuf
229
229
230
- # Install dash-api
231
- RUN cd /tmp \
232
- && mkdir -p /usr/lib/python3/dist-packages/dash_api \
233
- && wget https://raw.githubusercontent.com/sonic-net/sonic-dash-api/master/misc/pypkg/dash_api/__init__.py -O /usr/lib/python3/dist-packages/dash_api/__init__.py \
234
- && git clone https://github.com/sonic-net/sonic-dash-api.git \
235
- && protoc -I=sonic-dash-api/proto --python_out=/usr/lib/python3/dist-packages/dash_api sonic-dash-api/proto/*.proto \
236
- && rm -rf /tmp/sonic-dash-api
237
-
238
230
RUN mkdir /var/run/sshd
239
231
EXPOSE 22
240
232
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ DOCKER_ORCHAGENT_STEM = docker-orchagent
4
4
DOCKER_ORCHAGENT = $(DOCKER_ORCHAGENT_STEM ) .gz
5
5
DOCKER_ORCHAGENT_DBG = $(DOCKER_ORCHAGENT_STEM ) -$(DBG_IMAGE_MARK ) .gz
6
6
7
- $(DOCKER_ORCHAGENT)_DEPENDS += $(SWSS ) $(SONIC_RSYSLOG_PLUGIN )
7
+ $(DOCKER_ORCHAGENT)_DEPENDS += $(SWSS ) $(SONIC_RSYSLOG_PLUGIN ) $( LIB_SONIC_DASH_API )
8
8
9
9
ifeq ($(ENABLE_ASAN ) , y)
10
10
$(DOCKER_ORCHAGENT)_DEPENDS += $(SWSS_DBG )
Original file line number Diff line number Diff line change 1
1
# docker image for sonic-mgmt
2
2
DOCKER_SONIC_MGMT = docker-sonic-mgmt.gz
3
3
$(DOCKER_SONIC_MGMT)_PATH = $(DOCKERS_PATH ) /docker-sonic-mgmt
4
- $(DOCKER_SONIC_MGMT)_DEPENDS += $(SONIC_DEVICE_DATA ) $(PTF )
4
+ $(DOCKER_SONIC_MGMT)_DEPENDS += $(SONIC_DEVICE_DATA ) $(PTF ) $( LIB_SONIC_DASH_API )
5
5
SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_MGMT )
6
6
SONIC_BULLSEYE_DOCKERS += $(DOCKER_SONIC_MGMT )
You can’t perform that action at this time.
0 commit comments