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.

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

Fix build package version change issue #81

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions Dockerfile.build
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ RUN apt-get update \
pkg-config

COPY debs /debs
RUN dpkg -i /debs/libhiredis0.13_0.13.3-2_amd64.deb \
&& dpkg -i /debs/libhiredis-dev_0.13.3-2_amd64.deb \
&& dpkg -i /debs/libnl-3-200_3.2.27-2_amd64.deb \
&& dpkg -i /debs/libnl-genl-3-200_3.2.27-2_amd64.deb \
&& dpkg -i /debs/libnl-route-3-200_3.2.27-2_amd64.deb \
RUN dpkg -i /debs/libhiredis0.14_0.14.0-3~bpo9+1_amd64.deb \
&& dpkg -i /debs/libhiredis-dev_0.14.0-3~bpo9+1_amd64.deb \
&& dpkg -i /debs/libnl-3-200_3.5.0-1_amd64.deb \
&& dpkg -i /debs/libnl-genl-3-200_3.5.0-1_amd64.deb \
&& dpkg -i /debs/libnl-route-3-200_3.5.0-1_amd64.deb \
&& dpkg -i /debs/libnl-nf-3-200_3.5.0-1_amd64.deb \
&& dpkg -i /debs/libswsscommon_1.0.0_amd64.deb \
&& dpkg -i /debs/libswsscommon-dev_1.0.0_amd64.deb
RUN rm -fr /debs
Expand Down
11 changes: 6 additions & 5 deletions Dockerfile.common.prod
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ RUN apt-get update \
supervisor

COPY debs /debs
RUN dpkg -i /debs/libhiredis0.13_0.13.3-2_amd64.deb \
&& dpkg -i /debs/libhiredis-dev_0.13.3-2_amd64.deb \
&& dpkg -i /debs/libnl-3-200_3.2.27-1_amd64.deb \
&& dpkg -i /debs/libnl-genl-3-200_3.2.27-1_amd64.deb \
&& dpkg -i /debs/libnl-route-3-200_3.2.27-1_amd64.deb \
RUN dpkg -i /debs/libhiredis0.14_0.14.0-3~bpo9+1_amd64.deb \
&& dpkg -i /debs/libhiredis-dev_0.14.0-3~bpo9+1_amd64.deb \
&& dpkg -i /debs/libnl-3-200_3.5.0-1_amd64.deb \
&& dpkg -i /debs/libnl-genl-3-200_3.5.0-1_amd64.deb \
&& dpkg -i /debs/libnl-route-3-200_3.5.0-1_amd64.deb \
&& dpkg -i /debs/libnl-nf-3-200_3.5.0-1_amd64.deb \
&& dpkg -i /debs/libswsscommon_1.0.0_amd64.deb \
&& dpkg -i /debs/libswsscommon-dev_1.0.0_amd64.deb \
&& dpkg -i /debs/sonic-rest-api_1.0.1_amd64.deb \
Expand Down
11 changes: 6 additions & 5 deletions Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ RUN apt-get update \
procps

COPY debs /debs
RUN dpkg -i /debs/libhiredis0.13_0.13.3-2_amd64.deb \
&& dpkg -i /debs/libhiredis-dev_0.13.3-2_amd64.deb \
&& dpkg -i /debs/libnl-3-200_3.2.27-2_amd64.deb \
&& dpkg -i /debs/libnl-genl-3-200_3.2.27-2_amd64.deb \
&& dpkg -i /debs/libnl-route-3-200_3.2.27-2_amd64.deb \
RUN dpkg -i /debs/libhiredis0.14_0.14.0-3~bpo9+1_amd64.deb \
&& dpkg -i /debs/libhiredis-dev_0.14.0-3~bpo9+1_amd64.deb \
&& dpkg -i /debs/libnl-3-200_3.5.0-1_amd64.deb \
&& dpkg -i /debs/libnl-genl-3-200_3.5.0-1_amd64.deb \
&& dpkg -i /debs/libnl-route-3-200_3.5.0-1_amd64.deb \
&& dpkg -i /debs/libnl-nf-3-200_3.5.0-1_amd64.deb \
&& dpkg -i /debs/libswsscommon_1.0.0_amd64.deb \
&& dpkg -i /debs/libswsscommon-dev_1.0.0_amd64.deb \
&& dpkg -i /debs/sonic-rest-api_1.0.1_amd64.deb
Expand Down
15 changes: 8 additions & 7 deletions copy.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
set -e

SDIR=/home/debs/debs/stretch
cp $SDIR/libhiredis0.13_0.13.3-2_amd64.deb debs
cp $SDIR/libhiredis-dev_0.13.3-2_amd64.deb debs
cp $SDIR/libnl-3-200_3.2.27-2_amd64.deb debs
cp $SDIR/libnl-genl-3-200_3.2.27-2_amd64.deb debs
cp $SDIR/libnl-route-3-200_3.2.27-2_amd64.deb debs
SDIR=/projects/xumia/test/test3/sonic-restapi/debs/debs/stretch
cp $SDIR/libhiredis0.14_0.14.0-3~bpo9+1_amd64.deb debs
cp $SDIR/libhiredis-dev_0.14.0-3~bpo9+1_amd64.deb debs
cp $SDIR/libnl-3-200_3.5.0-1_amd64.deb debs
cp $SDIR/libnl-genl-3-200_3.5.0-1_amd64.deb debs
cp $SDIR/libnl-route-3-200_3.5.0-1_amd64.deb debs
cp $SDIR/libnl-nf-3-200_3.5.0-1_amd64.deb debs
cp $SDIR/libnl-nf-3-dev_3.5.0-1_amd64.deb debs
cp $SDIR/libswsscommon_1.0.0_amd64.deb debs
cp $SDIR/libswsscommon-dev_1.0.0_amd64.deb debs
cp $SDIR/libthrift-0.11.0_0.11.0-4_amd64.deb debs