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

Jump to bottom

PR - Updated Makefile, loxilib to v0.8.8 #357

Merged
merged 3 commits into from
Jul 20, 2023
Merged

PR - Updated Makefile, loxilib to v0.8.8 #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6af1c0f
Updated Makefile
TrekkieCoder Jul 20, 2023
aa25fc7
Updated to use latest loxilib-v0.8.8
TrekkieCoder Jul 20, 2023
0b1df0c
Merge branch 'loxilb-io:main' into main
TrekkieCoder Jul 20, 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
26 changes: 14 additions & 12 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,20 @@ docker-cp-ebpf: build
docker cp /opt/loxilb/llb_ebpf_main.o $(loxilbid):/opt/loxilb/llb_ebpf_main.o
docker cp /opt/loxilb/llb_xdp_main.o $(loxilbid):/opt/loxilb/llb_xdp_main.o

docker-rp: build
cp loxilb ./loxilb.rep
cp /opt/loxilb/llb_ebpf_main.o ./llb_ebpf_main.o.rep
cp /opt/loxilb/llb_xdp_main.o ./llb_xdp_main.o.rep
$(MAKE) docker
rm ./llb_ebpf_main.o.rep ./llb_xdp_main.o.rep ./loxilb.rep

docker-rp-ebpf: build
cp /opt/loxilb/llb_ebpf_main.o ./llb_ebpf_main.o.rep
cp /opt/loxilb/llb_xdp_main.o ./llb_xdp_main.o.rep
$(MAKE) docker
rm ./llb_ebpf_main.o.rep ./llb_xdp_main.o.rep
docker-run:
@docker stop $(dock) 2>&1 >> /dev/null || true
@docker rm $(dock) 2>&1 >> /dev/null || true
docker run -u root --cap-add SYS_ADMIN --restart unless-stopped --privileged -dt --entrypoint /bin/bash --name $(dock) ghcr.io/loxilb-io/loxilb:latest

docker-rp: docker-run docker-cp
docker commit ${loxilbid} ghcr.io/loxilb-io/loxilb:latest
@docker stop $(dock) 2>&1 >> /dev/null || true
@docker rm $(dock) 2>&1 >> /dev/null || true

docker-rp-ebpf: docker-run docker-cp-ebpf
docker commit ${loxilbid} ghcr.io/loxilb-io/loxilb:latest
@docker stop $(dock) 2>&1 >> /dev/null || true
@docker rm $(dock) 2>&1 >> /dev/null || true

docker:
docker build -t ghcr.io/loxilb-io/loxilb:latest .
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/go-openapi/swag v0.22.3
github.com/go-openapi/validate v0.22.0
github.com/jessevdk/go-flags v1.5.0
github.com/loxilb-io/loxilib v0.8.8-0.20230531161727-0b99321ae61d
github.com/loxilb-io/loxilib v0.8.8
github.com/osrg/gobgp/v3 v3.5.0
github.com/prometheus-community/pro-bing v0.1.0
github.com/prometheus/client_model v0.3.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/loxilb-io/loxilib v0.8.8-0.20230531161727-0b99321ae61d h1:LzQJ4F0FsEBzLPsETfC9Yu5MNhOcSle/ZWGhBQd8v78=
github.com/loxilb-io/loxilib v0.8.8-0.20230531161727-0b99321ae61d/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg=
github.com/loxilb-io/loxilib v0.8.8 h1:nW6RvLXDQxr5Pe2Ygg7qyYm4QG5y5cG+/jQ4m/DckP4=
github.com/loxilb-io/loxilib v0.8.8/go.mod h1:LoQCxBz+N0fO9rGwRmPHrQPHol/jUf4MNpph63Cydkg=
github.com/loxilb-io/sctp v0.0.0-20230519081703-6d1baec82fd4 h1:oDc2lsbfuQEcVP3k+Pw4v6Xdm3t4M9vBc1Y9egszv6g=
github.com/loxilb-io/sctp v0.0.0-20230519081703-6d1baec82fd4/go.mod h1:1a6hv8ISVQhnW5IVpW9o+OL6BAFlWiVpC0O4d19g+wQ=
github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
Expand Down
Loading