From d850a7abbc385390e579cd04158358450c6e4591 Mon Sep 17 00:00:00 2001 From: amass <168062547@qq.com> Date: Fri, 30 Dec 2022 18:31:57 +0800 Subject: [PATCH] add ubuntu20.04 develop image. --- .drone.yml | 59 +++++++++++++++++++++++++------------- raspberrypi.dockerfile | 14 +++++---- resources/notify.tpl | 6 ++++ ubuntu.dockerfile | 6 ++-- ubuntu2004.dockerfile | 65 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 123 insertions(+), 27 deletions(-) create mode 100644 resources/notify.tpl create mode 100644 ubuntu2004.dockerfile diff --git a/.drone.yml b/.drone.yml index b2dc841..d03ebaa 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2,23 +2,42 @@ kind: pipeline type: docker name: docker-build steps: -- name: deploy-mkdocs - image: plugins/docker - settings: - registry: registry.cn-shenzhen.aliyuncs.com - repo: registry.cn-shenzhen.aliyuncs.com/amass_toolset/develop - tags: mkdocs - dockerfile: mkdocs.dockerfile - username: 168062547@qq.com - password: - from_secret: docker_password -- name: deploy-ubuntu2004 - image: plugins/docker - settings: - registry: registry.cn-shenzhen.aliyuncs.com - repo: registry.cn-shenzhen.aliyuncs.com/amass_toolset/develop - tags: ubuntu2004 - dockerfile: ubuntu.dockerfile - username: 168062547@qq.com - password: - from_secret: docker_password \ No newline at end of file + - name: deploy-mkdocs + image: plugins/docker + settings: + registry: registry.cn-shenzhen.aliyuncs.com + repo: registry.cn-shenzhen.aliyuncs.com/amass_toolset/develop + tags: mkdocs + dockerfile: mkdocs.dockerfile + username: 168062547@qq.com + password: + from_secret: docker_password + - name: deploy-ubuntu2004 + image: plugins/docker + settings: + registry: registry.cn-shenzhen.aliyuncs.com + repo: registry.cn-shenzhen.aliyuncs.com/amass_toolset/develop + tags: ubuntu2004 + dockerfile: ubuntu2004.dockerfile + username: 168062547@qq.com + password: + from_secret: docker_password + - name: deploy-raspberrypi + image: plugins/docker + settings: + registry: registry.cn-shenzhen.aliyuncs.com + repo: registry.cn-shenzhen.aliyuncs.com/amass_toolset/develop + tags: raspberrypi + dockerfile: raspberrypi.dockerfile + username: 168062547@qq.com + password: + from_secret: docker_password + - name: notify + image: registry.cn-shenzhen.aliyuncs.com/amass_toolset/develop:20.04 + when: + status: + - failure + - success + commands: + - >- + cat resources/notify.tpl | envsubst | jq -sR . | xargs -0 -I {} curl -H "Content-Type: application/json" -X POST -d '{"type":"text","msg":{} }' https://amass.fun/notify diff --git a/raspberrypi.dockerfile b/raspberrypi.dockerfile index 03f5e5b..d401e24 100644 --- a/raspberrypi.dockerfile +++ b/raspberrypi.dockerfile @@ -17,10 +17,10 @@ RUN --mount=type=ssh \ rsync -avz --ignore-errors pi@$PI_ADDRESS:/lib sysroot && \ rsync -avz --ignore-errors pi@$PI_ADDRESS:/usr/include sysroot/usr && \ rsync -avz --ignore-errors --exclude lib/chromium-browser --exclude lib/libreoffice --exclude lib/scratch3 \ - --exclude lib/debug --exclude lib/arm-linux-gnueabihf/dri \ - --exclude lib/kernel --exclude lib/firmware --exclude lib/modules \ - --exclude lib/ruby --exclude lib/pypy --exclude lib/python2.7 --exclude lib/python3 --exclude lib/python3.9 \ - pi@$PI_ADDRESS:/usr/lib sysroot/usr ;exit 0 + --exclude lib/debug --exclude lib/arm-linux-gnueabihf/dri \ + --exclude lib/kernel --exclude lib/firmware --exclude lib/modules \ + --exclude lib/ruby --exclude lib/pypy --exclude lib/python2.7 --exclude lib/python3 --exclude lib/python3.9 \ + pi@$PI_ADDRESS:/usr/lib sysroot/usr ;exit 0 ADD resources/sysroot-relativelinks.py resources/raspberrypi.cmake /opt/RaspberryPi/ RUN ./sysroot-relativelinks.py sysroot @@ -94,4 +94,8 @@ RUN bash -c "sed -i -e 's/set_and_check(XLNT_INCLUDE_DIR \"include\")/# set_and_ RUN rm -fr /home/temp ENV LANG C.UTF-8 # eval $(ssh-agent) && ssh-add ~/.ssh/id_rsa -# docker build -f raspberrypi.dockerfile -t raspberrypi --build-arg PI_ADDRESS="192.168.1.2" --ssh default=$SSH_AUTH_SOCK . +# docker build -f raspberrypi.dockerfile -t develop:raspberrypi --build-arg PI_ADDRESS="192.168.1.2" --ssh default=$SSH_AUTH_SOCK . +# docker tag develop:raspberrypi registry.cn-shenzhen.aliyuncs.com/amass_toolset/develop:raspberrypi +# docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/develop:raspberrypi + + diff --git a/resources/notify.tpl b/resources/notify.tpl new file mode 100644 index 0000000..8b1397e --- /dev/null +++ b/resources/notify.tpl @@ -0,0 +1,6 @@ +repo: $DRONE_REPO_NAME +status: $DRONE_BUILD_STATUS +commit: $DRONE_COMMIT +构建: $DRONE_BUILD_LINK +仓库: $DRONE_REPO_LINK +提交注释: $DRONE_COMMIT_MESSAGE \ No newline at end of file diff --git a/ubuntu.dockerfile b/ubuntu.dockerfile index 479c578..51ab70f 100644 --- a/ubuntu.dockerfile +++ b/ubuntu.dockerfile @@ -5,7 +5,7 @@ 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 && \ apt-get update && \ - apt-get install -y wget git cmake ninja-build pkg-config \ + apt-get install -y wget curl jq gettext git cmake ninja-build pkg-config \ libssl-dev libcurl4-openssl-dev libffmpeg-ocaml-dev libfreetype-dev libalsa-ocaml-dev \ liblzma-dev libx264-dev gcc g++ @@ -17,7 +17,7 @@ RUN wget https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_ RUN tar xvf boost_1_81_0.tar.gz && \ tar xvf zeromq-4.3.4.tar.gz && \ tar xvf xlnt-1.5.0.tar.gz - + WORKDIR /home/temp/boost_1_81_0 RUN ./bootstrap.sh --prefix=/opt/Libraries/boost_1_81_0 RUN ./b2 install -q --prefix=/opt/Libraries/boost_1_81_0 threading=multi link=shared runtime-link=shared variant=release cxxstd=17 cxxflags=-fPIC cflags=-fPIC @@ -60,3 +60,5 @@ RUN rm -fr /home/temp ENV LANG C.UTF-8 # docker build -f ubuntu.dockerfile -t develop:22.04 . +# docker tag develop:22.04 registry.cn-shenzhen.aliyuncs.com/amass_toolset/develop:22.04 +# docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/develop:[镜像版本号] \ No newline at end of file diff --git a/ubuntu2004.dockerfile b/ubuntu2004.dockerfile new file mode 100644 index 0000000..97c983d --- /dev/null +++ b/ubuntu2004.dockerfile @@ -0,0 +1,65 @@ +FROM ubuntu:20.04 +LABEL maintainer 168062547@qq.com +ENV DEBIAN_FRONTEND=noninteractive +RUN sed -i 's/archive.ubuntu.com/mirrors.ustc.edu.cn/g' /etc/apt/sources.list && \ + apt-get update && \ + apt-get install -y software-properties-common curl wget jq gettext git ninja-build pkg-config \ + libssl-dev libcurl4-openssl-dev libffmpeg-ocaml-dev libfreetype-dev libalsa-ocaml-dev \ + liblzma-dev libx264-dev + +RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test && \ + apt-get install -y locate gcc-11 g++-11 && \ + updatedb && ldconfig && \ + update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 110 && \ + update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 110 + +WORKDIR /home/temp +RUN wget https://github.com/Kitware/CMake/releases/download/v3.25.0/cmake-3.25.0-linux-x86_64.tar.gz && \ + wget https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.gz && \ + wget https://github.com/zeromq/libzmq/releases/download/v4.3.4/zeromq-4.3.4.tar.gz && \ + wget https://github.com/tfussell/xlnt/archive/refs/tags/v1.5.0.tar.gz -O xlnt-1.5.0.tar.gz + +RUN tar xvf cmake-3.25.0-linux-x86_64.tar.gz -C /opt && \ + tar xvf boost_1_81_0.tar.gz && \ + tar xvf zeromq-4.3.4.tar.gz && \ + tar xvf xlnt-1.5.0.tar.gz +ENV PATH="${PATH}:/opt/cmake-3.25.0-linux-x86_64/bin" + +WORKDIR /home/temp/boost_1_81_0 +RUN ./bootstrap.sh --prefix=/opt/Libraries/boost_1_81_0 +RUN ./b2 install -q --prefix=/opt/Libraries/boost_1_81_0 threading=multi link=shared runtime-link=shared variant=release cxxstd=17 cxxflags=-fPIC cflags=-fPIC +ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/opt/Libraries/boost_1_81_0/lib" + +WORKDIR /home/temp/zeromq-4.3.4/build +RUN cmake \ + -G Ninja \ + -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_INSTALL_PREFIX=/opt/Libraries/zeromq-4.3.4_debug \ + .. +RUN ninja install +RUN rm -fr ./* +RUN cmake \ + -G Ninja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/opt/Libraries/zeromq-4.3.4_release \ + .. +RUN ninja install + +WORKDIR /home/temp/xlnt-1.5.0/build +RUN sed -i '1s/^/#include \n/' ../source/detail/number_format/number_formatter.cpp && \ + cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_INSTALL_PREFIX=/opt/Libraries/xlnt-1.5.0_debug .. && \ + ninja install && rm -fr ./* && \ + cmake -G Ninja -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/opt/Libraries/xlnt-1.5.0_release .. && \ + ninja install && \ + bash -c "sed -i -e 's/set_and_check(XLNT_INCLUDE_DIR \"include\")/# set_and_check(XLNT_INCLUDE_DIR \"include\")/g' /opt/Libraries/xlnt-1.5.0_debug/lib/cmake/xlnt/XlntConfig.cmake &&\ + sed -i -e 's/set_and_check(XLNT_INCLUDE_DIR \"include\")/# set_and_check(XLNT_INCLUDE_DIR \"include\")/g' /opt/Libraries/xlnt-1.5.0_release/lib/cmake/xlnt/XlntConfig.cmake" +WORKDIR / +RUN rm -fr /home/temp +ENV LANG C.UTF-8 + +# docker build -f ubuntu2004.dockerfile -t develop:20.04 . +# docker login --username=168062547@qq.com registry.cn-shenzhen.aliyuncs.com +# docker tag develop:20.04 registry.cn-shenzhen.aliyuncs.com/amass_toolset/develop:20.04 +# docker push registry.cn-shenzhen.aliyuncs.com/amass_toolset/develop:20.04 \ No newline at end of file