diff --git a/nanopb.dockerfile b/nanopb.dockerfile index a75d13b..90a982e 100644 --- a/nanopb.dockerfile +++ b/nanopb.dockerfile @@ -1,12 +1,11 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 LABEL maintainer 168062547@qq.com ENV DEBIAN_FRONTEND=noninteractive -RUN sed -i "s@http://.*archive.ubuntu.com@http://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list && \ - sed -i "s@http://.*security.ubuntu.com@http://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list && \ +RUN sed -i 's@//.*archive.ubuntu.com@//mirrors.ustc.edu.cn@g' /etc/apt/sources.list.d/ubuntu.sources && \ dpkg --add-architecture i386 && \ apt-get update && \ - apt-get install -y wget libc6:i386 libstdc++6:i386 + apt-get install -y make cmake wget gcc g++ libc6:i386 libstdc++6:i386 RUN cd /opt && \ wget https://jpa.kapsi.fi/nanopb/download/nanopb-0.3.9.3-linux-x86.tar.gz && \ @@ -14,7 +13,9 @@ RUN cd /opt && \ rm nanopb-0.3.9.3-linux-x86.tar.gz ENV PATH="${PATH}:/opt/nanopb-0.3.9.3-linux-x86/generator-bin" +ENV PATH="${PATH}:/opt/arm-himix200-linux/bin" - -# docker build -f nanopb.dockerfile -t nanopb:0.3.9.3 . -# docker run --rm -v .:/app -w /app nanopb:0.3.9.3 protoc --nanopb_out=./ PacketModel_all.proto \ No newline at end of file +# docker build -f nanopb.dockerfile -t frp-by1.wwvvww.cn:45288/nanopb:0.3.9.3 . +# docker push frp-by1.wwvvww.cn:45288/nanopb:0.3.9.3 +# docker run -it --rm --user 1000:1000 -v /opt:/opt -v $(pwd):$(pwd) -w $(pwd) frp-by1.wwvvww.cn:45288/nanopb:0.3.9.3 make server_protocol +# docker run -it --rm --user 1000:1000 -v /opt:/opt -v $(pwd):$(pwd) -w $(pwd) frp-by1.wwvvww.cn:45288/nanopb:0.3.9.3 make -j6 \ No newline at end of file