diff --git a/docker/Dockerfile_buidler b/docker/Dockerfile_buidler new file mode 100644 index 0000000000..e4e4cbe431 --- /dev/null +++ b/docker/Dockerfile_buidler @@ -0,0 +1,13 @@ +FROM ubuntu:22.04 + +RUN sed -i 's/http:\/\/archive.ubuntu.com/http:\/\/mirrors.aliyun.com/g' /etc/apt/sources.list ; \ + sed -i 's/http:\/\/ports.ubuntu.com/http:\/\/mirrors.aliyun.com/g' /etc/apt/sources.list ; \ + sed -i 's/http:\/\/security.ubuntu.com/http:\/\/mirrors.aliyun.com/g' /etc/apt/sources.list + +RUN apt-get update && apt-get install -y \ + ca-certificates \ + build-essential \ + git \ + cmake \ + autoconf \ + clang-tidy-12 diff --git a/docker/Dockerfile_pika b/docker/Dockerfile_pika index d2c4e6ec76..90c4a28fd1 100644 --- a/docker/Dockerfile_pika +++ b/docker/Dockerfile_pika @@ -1,27 +1,12 @@ -FROM ubuntu:22.04 AS builder +FROM pikadb/pika_builder:ubuntu_22.04 as builder -LABEL maintainer="SvenDowideit@home.org.au, zhangshaomin_1990@126.com" +LABEL maintainer="pikiwidb@gmail.com" ENV PIKA=/pika \ PIKA_BUILD_DIR=/tmp/pika \ PATH=${PIKA}:${PIKA}/bin:${PATH} \ BUILD_TYPE=RelWithDebInfo -ARG ENABLE_PROXY=false - -RUN if [ "$ENABLE_PROXY" = "true" ] ; \ - then sed -i 's/http:\/\/archive.ubuntu.com/http:\/\/mirrors.aliyun.com/g' /etc/apt/sources.list ; \ - sed -i 's/http:\/\/ports.ubuntu.com/http:\/\/mirrors.aliyun.com/g' /etc/apt/sources.list ; \ - fi - -RUN apt-get update && apt-get install -y \ - ca-certificates \ - build-essential \ - git \ - cmake \ - autoconf \ - clang-tidy-12 - WORKDIR ${PIKA_BUILD_DIR} COPY . ${PIKA_BUILD_DIR} @@ -29,22 +14,9 @@ COPY . ${PIKA_BUILD_DIR} RUN cmake -B ${PIKA_BUILD_DIR}/build -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DUSE_PIKA_TOOLS=OFF RUN cmake --build ${PIKA_BUILD_DIR}/build --config ${BUILD_TYPE} -FROM ubuntu:22.04 - -LABEL maintainer="SvenDwideit@home.org.au, zhangshaomin_1990@126.com" - -ARG ENABLE_PROXY=false - -RUN if [ "$ENABLE_PROXY" = "true" ] ; \ - then sed -i 's/http:\/\/archive.ubuntu.com/http:\/\/mirrors.aliyun.com/g' /etc/apt/sources.list ; \ - sed -i 's/http:\/\/ports.ubuntu.com/http:\/\/mirrors.aliyun.com/g' /etc/apt/sources.list ; \ - fi +FROM pikadb/pika_runner:ubuntu_22.04 -RUN apt-get update && apt-get install -y \ - ca-certificates \ - rsync && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists /var/cache/apt/archives +LABEL maintainer="pikiwidb@gmail.com" ENV PIKA=/pika \ PIKA_BUILD_DIR=/tmp/pika \ diff --git a/docker/Dockerfile_runner b/docker/Dockerfile_runner new file mode 100644 index 0000000000..9ea208f85c --- /dev/null +++ b/docker/Dockerfile_runner @@ -0,0 +1,11 @@ +FROM ubuntu:22.04 + +RUN sed -i 's/http:\/\/archive.ubuntu.com/http:\/\/mirrors.aliyun.com/g' /etc/apt/sources.list ; \ + sed -i 's/http:\/\/ports.ubuntu.com/http:\/\/mirrors.aliyun.com/g' /etc/apt/sources.list ; \ + sed -i 's/http:\/\/security.ubuntu.com/http:\/\/mirrors.aliyun.com/g' /etc/apt/sources.list + +RUN apt-get update && apt-get install -y \ + ca-certificates \ + rsync && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/docker/build_pika_docker.sh b/docker/build_pika_docker.sh index 2598a8fa44..1d71acb806 100755 --- a/docker/build_pika_docker.sh +++ b/docker/build_pika_docker.sh @@ -91,11 +91,11 @@ then docker buildx use pika-builder fi - docker buildx build --platform ${PLATFORM} -t ${TAG} -f Dockerfile_pika --build-arg ENABLE_PROXY=${PROXY} .. + docker buildx build --platform ${PLATFORM} -t ${TAG} --push -f Dockerfile_pika .. else # build single-arch image - docker build -t ${TAG} -f Dockerfile_pika --build-arg ENABLE_PROXY=${PROXY} .. + docker build -t ${TAG} -f Dockerfile_pika .. fi