Skip to content

Commit

Permalink
Remove VS platform from dockerfile
Browse files Browse the repository at this point in the history
Signed-off-by: Yurii Lisovskyi <[email protected]>
  • Loading branch information
yuriilisovskyi committed Oct 3, 2023
1 parent 94d3bca commit 78f0d9b
Show file tree
Hide file tree
Showing 5 changed files with 91 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/sc-client-server-deb10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ jobs:
with:
name: Server Image
path: sc-server.tar

- name: Build Thrift server Docker image
run: ./build.sh -i server -o deb10 -s thrift

build-sc-client:
name: Build SAI Challenger client image
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/sc-client-server-deb11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ jobs:
name: Server Image
path: sc-server.tar

- name: Build Thrift server Docker image
run: ./build.sh -i server -o deb11 -s thrift

build-sc-client:
name: Build SAI Challenger client image
runs-on: ubuntu-20.04
Expand Down
8 changes: 0 additions & 8 deletions configs/server/supervisord.conf.thrift
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@ stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true

[program:wait-interfaces]
command=/usr/bin/wait-interfaces.sh
priority=2
startsecs=0
autostart=false
autorestart=false
dependent_startup=true

[program:saiserver]
command=/usr/sbin/saiserver -f /usr/share/sonic/hwsku/port_config.ini -p /usr/share/sonic/hwsku/sai.profile
priority=3
Expand Down
85 changes: 85 additions & 0 deletions dockerfiles/bullseye/Dockerfile.saithrift-server
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
FROM debian:buster-slim

RUN echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster main contrib non-free" >> /etc/apt/sources.list && \
echo "deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian/ buster main contrib non-free" >> /etc/apt/sources.list && \
echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free" >> /etc/apt/sources.list && \
echo "deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ buster/updates main contrib non-free" >> /etc/apt/sources.list && \
echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian buster-backports main" >> /etc/apt/sources.list

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

COPY sai.env /

# Install generic packages
RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y \
apt-utils \
vim \
curl \
wget \
iproute2 \
unzip \
git \
procps \
build-essential \
graphviz \
doxygen \
aspell \
python3-pip \
rsyslog \
supervisor

# Add support for supervisord to handle startup dependencies
RUN pip3 install supervisord-dependent-startup==1.4.0

# Install generic packages
RUN apt-get install -y \
libtemplate-perl \
libconst-fast-perl \
libmoosex-aliases-perl \
libnamespace-autoclean-perl \
libgetopt-long-descriptive-perl \
aspell-en bison flex g++ \
libboost-all-dev libevent-dev libssl-dev \
libpython3-dev libpcap-dev

WORKDIR /sai

RUN apt-get install -y pkg-config \
&& wget "http://archive.apache.org/dist/thrift/0.11.0/thrift-0.11.0.tar.gz" \
&& tar -xf thrift-0.11.0.tar.gz \
&& cd thrift-0.11.0 \
&& ./bootstrap.sh \
&& ./configure --prefix=/usr --with-cpp --with-python \
--with-qt4=no --with-qt5=no --with-csharp=no --with-java=no --with-erlang=no \
--with-nodejs=no --with-lua=no --with-per=no --with-php=no --with-dart=no \
--with-ruby=no --with-haskell=no --with-go=no --with-rs=no --with-haxe=no \
--with-dotnetcore=no --with-d=no \
&& make && make install \
&& pip3 install ctypesgen lib/py \
&& cd /sai \
&& rm -rf thrift-0.11.0 thrift-0.11.0.tar.gz ;

ENV SAITHRIFTV2=y
ENV GEN_SAIRPC_OPTS="-cve"
ENV SAIRPC_EXTRA_LIBS="-L/usr/local/lib/ -lpthread"

RUN git clone https://github.com/opencomputeproject/SAI.git \
&& cd SAI && git fetch origin \
&& . /sai.env \
&& git checkout ${SAI_ID} \
&& cd meta \
&& make all libsaimetadata.so libsai.so \
&& cp libsaimetadata.so /usr/lib \
&& cp libsai.so /usr/lib \
&& cd .. \
&& mkdir /usr/include/sai/ \
&& cp ./inc/sai*.h /usr/include/sai/ \
&& cp ./experimental/sai*.h /usr/include/sai/ \
&& make saithrift-install

WORKDIR /sai-challenger

COPY configs/server/supervisord.conf.thrift /etc/supervisor/conf.d/supervisord.conf

CMD ["/usr/bin/supervisord"]
1 change: 0 additions & 1 deletion dockerfiles/buster/Dockerfile.saithrift-server
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ RUN apt-get install -y thrift-compiler libthrift-dev libthrift-0.11.0 \
&& pip3 install ctypesgen thrift==0.11.0 ;

ENV SAITHRIFTV2=y
ENV platform=vs
ENV GEN_SAIRPC_OPTS="-cve"
ENV SAIRPC_EXTRA_LIBS="-L/usr/local/lib/ -lpthread"

Expand Down

0 comments on commit 78f0d9b

Please sign in to comment.