Merge pull request #2 from kerwenwwer/dev

Dev
NTHU-LSALAB · Mar 6, 2024 · 73d9a95 · 73d9a95
2 parents 458a5ec + 3f61ac3
commit 73d9a95
Show file tree

Hide file tree

Showing 27 changed files with 683 additions and 279 deletions.
diff --git a/.env b/.env
@@ -1 +1,2 @@
-MY_PROTO=XDP
+MY_PROTO=UDP
+#DEBUG=--debug
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ bin/
 go.sum
 bpf/bpf_*
 .vscode
+log
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,12 @@ FROM golang:1.19 AS ebpf-tcp-proxy
 
 USER root
 
-RUN apt-get update && apt-get install -y bpftool iproute2 lsof netcat-traditional tmux 
+RUN apt-get update && apt-get install -y bpftool iproute2 lsof netcat-traditional
+RUN apt install -y tmux tshark iputils-ping iproute2 net-tools tcpdump traceroute
 
-COPY ./bpf/* /bpf/
+COPY bpf/* /bpf/
 COPY bin/xdp-gossip /usr/local/bin/xdp-gossip
+
+COPY k8s/entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
-all: bpf/*.o build
+all: build
+docker: docker-build docker-push
 
 .PHONY: bpf/*.o 
 bpf/*.o: bpf/*.c
@@ -10,7 +11,11 @@ build: bpf/*.o
 
 .PHONY: docker-build
 docker-build:
-	docker build -t xdp-gossip .
+	docker build -t kerwenwwer/gossip-service:latest .
+
+.PHONY: docker-push
+docker-push:
+	docker push kerwenwwer/gossip-service:latest
 
 .PHONY: docker-up
 docker-up:

diff --git a/bench/list.sh b/bench/list.sh
diff --git a/bench/propagation.sh b/bench/propagation.sh
diff --git a/bench/publish.py b/bench/publish.py
diff --git a/bench/publish.sh b/bench/publish.sh
diff --git a/bench/start_cluster.sh b/bench/start_cluster.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ bin/ @@
     go.sum
     bpf/bpf_*
     .vscode
+    log