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

[docker-sonic-vs] Set PLATFORM and HWSKU env vars in Dockerfile (#5266)

Browse Source 
sonic-py-common package relies on the `PLATFORM` environment variable to be set at runtime in the SONiC VS container. Exporting the variables in the start.sh script causes the variables to only be available to the shell running start.sh and any subshells it spawns. However, once the script exits, the variable is lost. This is resulting in the failure of tests which are run in the VS container, as they call applications which in turn call sonic-py-common functions which rely on PLATFORM to be set.

Setting the environment variables in the Dockerfile allows them to persist through the entire runtime of the container.
This commit is contained in:
Joe LeVeque 2020-09-01 13:39:10 -07:00 committed by GitHub
parent 426b6aaf5b
commit 5c73c0197f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,4 +151,8 @@ RUN rm /etc/frr/frr.conf
# Create /var/warmboot/teamd folder for teammgrd
RUN mkdir -p /var/warmboot/teamd
# Set PLATFORM and HWSKU environment variables
ENV PLATFORM=x86_64-kvm_x86_64-r0
ENV HWSKU=Force10-S6000
ENTRYPOINT ["/usr/bin/supervisord"]

6
platform/vs/docker-sonic-vs/start.sh
View File

@ -1,9 +1,9 @@
#!/bin/bash -e
# generate configuration
# Generate configuration
export PLATFORM=x86_64-kvm_x86_64-r0
export HWSKU=Force10-S6000
# NOTE: 'PLATFORM' and 'HWSKU' environment variables are set
# in the Dockerfile so that they persist for the life of the container
ln -sf /usr/share/sonic/device/$PLATFORM/$HWSKU /usr/share/sonic/hwsku