Skip to content

Commit

Permalink
Temporarily remove --squash option during docker building
Browse files Browse the repository at this point in the history
Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
  • Loading branch information
Shu0T1an ChenG committed Oct 1, 2019
1 parent 7f63811 commit e9e3957
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion scripts/common/sonic-utilities-build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion scripts/vs/sonic-swss-build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions scripts/vs/sonic-swss-build/docker-sonic-vs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

0 comments on commit e9e3957

Please sign in to comment.