From e9e39576e2f964538cb6648cf3127017b6745f2a Mon Sep 17 00:00:00 2001 From: Shu0T1an ChenG Date: Tue, 1 Oct 2019 10:36:27 -0700 Subject: [PATCH] Temporarily remove --squash option during docker building Signed-off-by: Shu0T1an ChenG --- scripts/common/sonic-utilities-build/build.sh | 2 +- scripts/vs/sonic-swss-build/build.sh | 2 +- scripts/vs/sonic-swss-build/docker-sonic-vs/Dockerfile | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/common/sonic-utilities-build/build.sh b/scripts/common/sonic-utilities-build/build.sh index e888ca016a..87272ad706 100755 --- a/scripts/common/sonic-utilities-build/build.sh +++ b/scripts/common/sonic-utilities-build/build.sh @@ -64,5 +64,5 @@ sudo mount --bind ../../target/files/stretch docker-sonic-vs/files sudo mount --bind ../../target/python-debs docker-sonic-vs/python-debs sudo mount --bind ../../target/python-wheels docker-sonic-vs/python-wheels docker load < ../../target/docker-config-engine-stretch.gz -docker build --squash --no-cache -t docker-sonic-vs:${JOB_NAME##*/}.${BUILD_NUMBER} docker-sonic-vs +docker build --no-cache -t docker-sonic-vs:${JOB_NAME##*/}.${BUILD_NUMBER} docker-sonic-vs docker save docker-sonic-vs:${JOB_NAME##*/}.${BUILD_NUMBER} | gzip -c > ../../target/docker-sonic-vs.gz diff --git a/scripts/vs/sonic-swss-build/build.sh b/scripts/vs/sonic-swss-build/build.sh index e76310bfa9..ff1064e905 100755 --- a/scripts/vs/sonic-swss-build/build.sh +++ b/scripts/vs/sonic-swss-build/build.sh @@ -17,7 +17,7 @@ docker load < buildimage/target/docker-sonic-vs.gz pushd scripts/vs/sonic-swss-build mkdir -p docker-sonic-vs/debs sudo mount --bind debs docker-sonic-vs/debs -docker build --squash --no-cache -t docker-sonic-vs:${JOB_NAME##*/}.${BUILD_NUMBER} docker-sonic-vs +docker build --no-cache -t docker-sonic-vs:${JOB_NAME##*/}.${BUILD_NUMBER} docker-sonic-vs sudo umount docker-sonic-vs/debs popd diff --git a/scripts/vs/sonic-swss-build/docker-sonic-vs/Dockerfile b/scripts/vs/sonic-swss-build/docker-sonic-vs/Dockerfile index c571227526..b2a25a87dc 100644 --- a/scripts/vs/sonic-swss-build/docker-sonic-vs/Dockerfile +++ b/scripts/vs/sonic-swss-build/docker-sonic-vs/Dockerfile @@ -8,6 +8,8 @@ RUN dpkg -i /debs/libsaimetadata_1.0.0_amd64.deb RUN dpkg -i /debs/libsairedis_1.0.0_amd64.deb RUN dpkg -i /debs/libsaivs_1.0.0_amd64.deb RUN dpkg -i /debs/syncd-vs_1.0.0_amd64.deb +RUN md5sum /usr/bin/buffermgrd RUN dpkg -i /debs/swss_1.0.0_amd64.deb +RUN md5sum /usr/bin/buffermgrd ENTRYPOINT ["/usr/bin/supervisord"]