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.

Sign up for GitHub

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

[=] switch interop docker build action to main branch #393

Merged
merged 6 commits into from
Dec 26, 2023
Merged

[=] switch interop docker build action to main branch #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cab7c1
[!] fix interop problems and use babassl instead
Kulsk Dec 26, 2023
9e076cd
[+] add main branch for interop
Kulsk Dec 26, 2023
9fa266e
[!] fix typo
Kulsk Dec 26, 2023
4012745
test build on interop_main
Kulsk Dec 26, 2023
4d3c050
[!] fix ssl missing error
Kulsk Dec 26, 2023
f10b119
[-] no more interop_main
Kulsk Dec 26, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/interop-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build interop Docker image

on:
push:
branches: [ interop ]
branches: [ main, interop ]

permissions: read-all

Expand Down
25 changes: 8 additions & 17 deletions interop/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,27 @@
FROM martenseemann/quic-network-simulator-endpoint:latest

ENV XQC_PATH /xquic \
SSL_PATH $XQC_PATH/third_party/boringssl \
SSL_INC_PATH $SSL_PATH/include \
SSL_LIB_PATH $SSL_PATH/build/ssl/libssl.a;$SSL_PATH/build/crypto/libcrypto.a

RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive \
apt-get install -y --no-install-recommends build-essential \
git cmake golang make autoconf automake libtool \
libevent-dev net-tools && \
go env -w GOPROXY=https://goproxy.cn && \
git clone --depth 1 --branch interop https://github.com/alibaba/xquic.git && \
git clone --depth 1 https://github.com/google/boringssl.git xquic/third_party/boringssl && \
cd xquic/third_party/boringssl/ && \
if [ ! -d build ]; then mkdir build; else rm -rf build; mkdir build; fi && \
cd build && \
cmake -DBUILD_SHARED_LIBS=0 -DCMAKE_C_FLAGS="-fPIC" -DCMAKE_CXX_FLAGS="-fPIC" .. && \
make ssl crypto && \
cd ../../../../ && \
git clone --depth 1 https://github.com/alibaba/xquic.git && \
git clone --depth 1 https://github.com/Tongsuo-Project/Tongsuo.git xquic/third_party/babassl && \
cd xquic/third_party/babassl/ && \
./Configure --api=1.1.1 no-deprecated && make -j && \
cd ../../../ && \
mkdir xquic_bin && \
cd xquic_bin && \
cmake -DSSL_TYPE="boringssl" \
-DSSL_PATH="$SSL_PATH" \
-DSSL_INC_PATH="$SSL_INC_PATH" \
-DSSL_LIB_PATH="$SSL_LIB_PATH" \
cmake -DSSL_TYPE="babassl" \
-DSSL_PATH="/xquic/third_party/babassl" \
-DCMAKE_BUILD_TYPE=DEBUG \
-DXQC_PRINT_SECRET=1 \
-DXQC_ENABLE_TESTING=1 \
../xquic/ && \
make -j && \
rm -rf CMake* Makefile *.cmake tests xqc_configure.h test_client test_server && \
mv demo/demo_* . && \
cd .. && rm -rf xquic/ && \
apt-get -y purge \
git cmake golang make autoconf automake libtool && \
Expand Down
Loading