From c86ff4a76f226c6c5798dbace87fc02b98afbdd9 Mon Sep 17 00:00:00 2001 From: Ian Chen Date: Mon, 8 May 2023 18:26:18 +0800 Subject: [PATCH] support: use local compiled files to build docker image --- Dockerfile | 8 +++++--- Makefile | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d322afcb..892181e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,10 +56,12 @@ RUN rm -fr /root/loxilb-io/loxilb/.git RUN rm -fr /root/loxilb-io/loxilb/.github RUN mkdir -p /root/loxilb-io/loxilb/ RUN cp /usr/local/sbin/loxilb /root/loxilb-io/loxilb/loxilb -#RUN /usr/local/sbin/mkllb_bpffs -#RUN cd /root/loxilb-io/loxilb/ && make test - +# Optional files, only apply when files exist +COPY ./loxilb.rep* /root/loxilb-io/loxilb/loxilb +COPY ./llb_ebpf_main.o.rep* /opt/loxilb/llb_ebpf_main.o +COPY ./llb_xdp_main.o.rep* /opt/loxilb/llb_xdp_main.o + ENTRYPOINT ["/root/loxilb-io/loxilb/loxilb"] # Expose Ports diff --git a/Makefile b/Makefile index 9e868914..8e3d79bc 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,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: +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: docker build -t ghcr.io/loxilb-io/loxilb:latest . docker-arm64: