From 2af3e00a0f94bdb68f8c41c0b4f5b819252c104e Mon Sep 17 00:00:00 2001 From: George <58841610+Shinji-IkariG@users.noreply.github.com> Date: Wed, 10 Jan 2024 14:50:02 +0800 Subject: [PATCH] Remove libdwarf for docker (#116) * Update pull_request.yml * Update pull_request.yml * remove libdwarf for docker --- docker/aarch64/centos-7.Dockerfile | 46 ------------------------ docker/aarch64/centos-8.Dockerfile | 50 --------------------------- docker/aarch64/ubuntu-1604.Dockerfile | 44 ----------------------- docker/aarch64/ubuntu-1804.Dockerfile | 44 ----------------------- docker/aarch64/ubuntu-2004.Dockerfile | 45 ------------------------ docker/aarch64/ubuntu-2110.Dockerfile | 45 ------------------------ docker/aarch64/ubuntu-2204.Dockerfile | 45 ------------------------ docker/buildx/centos-7.Dockerfile | 10 ------ docker/buildx/centos-8.Dockerfile | 10 ------ docker/buildx/rockylinux-8.Dockerfile | 10 ------ docker/buildx/ubuntu-2004.Dockerfile | 1 - docker/buildx/ubuntu-2204.Dockerfile | 1 - docker/buildx/ubuntu-2304.Dockerfile | 50 --------------------------- docker/x86_64/centos-7.Dockerfile | 46 ------------------------ docker/x86_64/centos-8.Dockerfile | 49 -------------------------- docker/x86_64/ubuntu-1604.Dockerfile | 45 ------------------------ docker/x86_64/ubuntu-1804.Dockerfile | 45 ------------------------ docker/x86_64/ubuntu-2004.Dockerfile | 45 ------------------------ docker/x86_64/ubuntu-2110.Dockerfile | 45 ------------------------ docker/x86_64/ubuntu-2204.Dockerfile | 45 ------------------------ 20 files changed, 721 deletions(-) delete mode 100644 docker/aarch64/centos-7.Dockerfile delete mode 100644 docker/aarch64/centos-8.Dockerfile delete mode 100644 docker/aarch64/ubuntu-1604.Dockerfile delete mode 100644 docker/aarch64/ubuntu-1804.Dockerfile delete mode 100644 docker/aarch64/ubuntu-2004.Dockerfile delete mode 100644 docker/aarch64/ubuntu-2110.Dockerfile delete mode 100644 docker/aarch64/ubuntu-2204.Dockerfile delete mode 100644 docker/buildx/ubuntu-2304.Dockerfile delete mode 100644 docker/x86_64/centos-7.Dockerfile delete mode 100644 docker/x86_64/centos-8.Dockerfile delete mode 100644 docker/x86_64/ubuntu-1604.Dockerfile delete mode 100644 docker/x86_64/ubuntu-1804.Dockerfile delete mode 100644 docker/x86_64/ubuntu-2004.Dockerfile delete mode 100644 docker/x86_64/ubuntu-2110.Dockerfile delete mode 100644 docker/x86_64/ubuntu-2204.Dockerfile diff --git a/docker/aarch64/centos-7.Dockerfile b/docker/aarch64/centos-7.Dockerfile deleted file mode 100644 index 0a44f34..0000000 --- a/docker/aarch64/centos-7.Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM arm64v8/centos:7 -SHELL ["/bin/bash", "-c"] -RUN yum update -y -RUN yum install -y make \ - git \ - m4 \ - wget \ - unzip \ - xz \ - patch \ - python3 \ - python3-devel \ - python \ - python-devel \ - redhat-lsb-core \ - perl-Data-Dumper \ - perl-Thread-Queue \ - readline-devel \ - ncurses-devel \ - zlib-devel \ - gcc \ - gcc-c++ \ - cmake \ - libtool \ - autoconf \ - autoconf-archive \ - automake \ - bison \ - flex \ - which \ - gperf \ - gettext - -ENV NG_URL=https://raw.githubusercontent.com/dutor/nebula-gears/master/install -ENV OSS_UTIL_URL=https://gosspublic.alicdn.com/ossutil/1.7.13/ossutilarm64 -ENV PACKAGE_DIR=/usr/src/third-party -RUN curl -s ${NG_URL} | bash - -RUN mkdir -p ${PACKAGE_DIR} -WORKDIR ${PACKAGE_DIR} - -COPY oss-upload.sh ${PACKAGE_DIR}/oss-upload.sh -RUN chmod +x ${PACKAGE_DIR}/oss-upload.sh - -RUN wget -q -O /usr/bin/ossutil64 ${OSS_UTIL_URL} -RUN chmod +x /usr/bin/ossutil64 diff --git a/docker/aarch64/centos-8.Dockerfile b/docker/aarch64/centos-8.Dockerfile deleted file mode 100644 index 4db5348..0000000 --- a/docker/aarch64/centos-8.Dockerfile +++ /dev/null @@ -1,50 +0,0 @@ -FROM arm64v8/centos:8 -SHELL ["/bin/bash", "-c"] -RUN cd /etc/yum.repos.d/ -RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* -RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* -RUN yum update -y -RUN yum install -y epel-release yum-utils -RUN yum config-manager --set-enabled powertools -RUN yum update -y -RUN yum install -y make \ - git \ - m4 \ - wget \ - unzip \ - xz \ - patch \ - python3 \ - python3-devel \ - redhat-lsb-core \ - perl-Data-Dumper \ - perl-Thread-Queue \ - readline-devel \ - ncurses-devel \ - zlib-devel \ - gcc \ - gcc-c++ \ - cmake \ - libtool \ - autoconf \ - autoconf-archive \ - automake \ - bison \ - flex \ - gperf \ - gettext \ - autoconf-archive - -ENV NG_URL=https://raw.githubusercontent.com/dutor/nebula-gears/master/install -ENV OSS_UTIL_URL=https://gosspublic.alicdn.com/ossutil/1.7.13/ossutilarm64 -ENV PACKAGE_DIR=/usr/src/third-party -RUN curl -s ${NG_URL} | bash - -RUN mkdir -p ${PACKAGE_DIR} -WORKDIR ${PACKAGE_DIR} - -COPY oss-upload.sh ${PACKAGE_DIR}/oss-upload.sh -RUN chmod +x ${PACKAGE_DIR}/oss-upload.sh - -RUN wget -q -O /usr/bin/ossutil64 ${OSS_UTIL_URL} -RUN chmod +x /usr/bin/ossutil64 diff --git a/docker/aarch64/ubuntu-1604.Dockerfile b/docker/aarch64/ubuntu-1604.Dockerfile deleted file mode 100644 index b6a8b8c..0000000 --- a/docker/aarch64/ubuntu-1604.Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM arm64v8/ubuntu:16.04 -SHELL ["/bin/bash", "-c"] -RUN apt-get clean -RUN apt-get update -RUN apt-get install -y make \ - git \ - m4 \ - wget \ - unzip \ - xz-utils \ - patch \ - python \ - curl \ - python-dev \ - lsb-core \ - libz-dev \ - build-essential \ - libreadline-dev \ - ncurses-dev \ - build-essential \ - cmake \ - libtool \ - automake \ - autoconf \ - autoconf-archive \ - autotools-dev \ - bison \ - flex \ - gperf \ - gettext - -ENV NG_URL=https://raw.githubusercontent.com/dutor/nebula-gears/master/install -ENV OSS_UTIL_URL=https://gosspublic.alicdn.com/ossutil/1.7.13/ossutilarm64 -ENV PACKAGE_DIR=/usr/src/third-party -RUN set -o pipefail && curl -s ${NG_URL} | bash - -RUN mkdir -p ${PACKAGE_DIR} -WORKDIR ${PACKAGE_DIR} - -COPY oss-upload.sh ${PACKAGE_DIR}/oss-upload.sh -RUN chmod +x ${PACKAGE_DIR}/oss-upload.sh - -RUN wget -q -O /usr/bin/ossutil64 ${OSS_UTIL_URL} -RUN chmod +x /usr/bin/ossutil64 diff --git a/docker/aarch64/ubuntu-1804.Dockerfile b/docker/aarch64/ubuntu-1804.Dockerfile deleted file mode 100644 index ccacd65..0000000 --- a/docker/aarch64/ubuntu-1804.Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM arm64v8/ubuntu:18.04 -SHELL ["/bin/bash", "-c"] -RUN apt-get clean -RUN apt-get update -RUN apt-get install -y make \ - git \ - m4 \ - wget \ - unzip \ - xz-utils \ - patch \ - python \ - curl \ - python-dev \ - lsb-core \ - libz-dev \ - build-essential \ - libreadline-dev \ - ncurses-dev \ - build-essential \ - cmake \ - libtool \ - automake \ - autoconf \ - autoconf-archive \ - autotools-dev \ - bison \ - flex \ - gperf \ - gettext - -ENV NG_URL=https://raw.githubusercontent.com/dutor/nebula-gears/master/install -ENV OSS_UTIL_URL=https://gosspublic.alicdn.com/ossutil/1.7.13/ossutilarm64 -ENV PACKAGE_DIR=/usr/src/third-party -RUN set -o pipefail && curl -s ${NG_URL} | bash - -RUN mkdir -p ${PACKAGE_DIR} -WORKDIR ${PACKAGE_DIR} - -COPY oss-upload.sh ${PACKAGE_DIR}/oss-upload.sh -RUN chmod +x ${PACKAGE_DIR}/oss-upload.sh - -RUN wget -q -O /usr/bin/ossutil64 ${OSS_UTIL_URL} -RUN chmod +x /usr/bin/ossutil64 diff --git a/docker/aarch64/ubuntu-2004.Dockerfile b/docker/aarch64/ubuntu-2004.Dockerfile deleted file mode 100644 index 9eb8726..0000000 --- a/docker/aarch64/ubuntu-2004.Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM arm64v8/ubuntu:20.04 -SHELL ["/bin/bash", "-c"] -ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get clean -RUN apt-get update -RUN apt-get install -y make \ - git \ - m4 \ - wget \ - unzip \ - xz-utils \ - patch \ - python \ - curl \ - python-dev \ - lsb-core \ - libz-dev \ - build-essential \ - libreadline-dev \ - ncurses-dev \ - build-essential \ - cmake \ - libtool \ - automake \ - autoconf \ - autoconf-archive \ - autotools-dev \ - bison \ - flex \ - gperf \ - gettext - -ENV NG_URL=https://raw.githubusercontent.com/dutor/nebula-gears/master/install -ENV OSS_UTIL_URL=https://gosspublic.alicdn.com/ossutil/1.7.13/ossutilarm64 -ENV PACKAGE_DIR=/usr/src/third-party -RUN set -o pipefail && curl -s ${NG_URL} | bash - -RUN mkdir -p ${PACKAGE_DIR} -WORKDIR ${PACKAGE_DIR} - -COPY oss-upload.sh ${PACKAGE_DIR}/oss-upload.sh -RUN chmod +x ${PACKAGE_DIR}/oss-upload.sh - -RUN wget -q -O /usr/bin/ossutil64 ${OSS_UTIL_URL} -RUN chmod +x /usr/bin/ossutil64 diff --git a/docker/aarch64/ubuntu-2110.Dockerfile b/docker/aarch64/ubuntu-2110.Dockerfile deleted file mode 100644 index d50e037..0000000 --- a/docker/aarch64/ubuntu-2110.Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM arm64v8/ubuntu:21.10 -SHELL ["/bin/bash", "-c"] -ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get clean -RUN apt-get update -RUN apt-get install -y make \ - git \ - m4 \ - wget \ - unzip \ - xz-utils \ - patch \ - python2 \ - curl \ - python2-dev \ - lsb-core \ - zlib1g-dev \ - build-essential \ - libreadline-dev \ - libncurses-dev \ - build-essential \ - cmake \ - libtool \ - automake \ - autoconf \ - autoconf-archive \ - autotools-dev \ - bison \ - flex \ - gperf \ - gettext - -ENV NG_URL=https://raw.githubusercontent.com/dutor/nebula-gears/master/install -ENV OSS_UTIL_URL=http://gosspublic.alicdn.com/ossutil/1.7.13/ossutilarm64 -ENV PACKAGE_DIR=/usr/src/third-party -RUN set -o pipefail && curl -s ${NG_URL} | bash - -RUN mkdir -p ${PACKAGE_DIR} -WORKDIR ${PACKAGE_DIR} - -COPY oss-upload.sh ${PACKAGE_DIR}/oss-upload.sh -RUN chmod +x ${PACKAGE_DIR}/oss-upload.sh - -RUN wget -q -O /usr/bin/ossutil64 ${OSS_UTIL_URL} -RUN chmod +x /usr/bin/ossutil64 diff --git a/docker/aarch64/ubuntu-2204.Dockerfile b/docker/aarch64/ubuntu-2204.Dockerfile deleted file mode 100644 index 84bef03..0000000 --- a/docker/aarch64/ubuntu-2204.Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM arm64v8/ubuntu:22.04 -SHELL ["/bin/bash", "-c"] -ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get clean -RUN apt-get update -RUN apt-get install -y make \ - git \ - m4 \ - wget \ - unzip \ - xz-utils \ - patch \ - python2 \ - curl \ - python2-dev \ - lsb-core \ - zlib1g-dev \ - build-essential \ - libreadline-dev \ - libncurses-dev \ - build-essential \ - cmake \ - libtool \ - automake \ - autoconf \ - autoconf-archive \ - autotools-dev \ - bison \ - flex \ - gperf \ - gettext - -ENV NG_URL=https://raw.githubusercontent.com/dutor/nebula-gears/master/install -ENV OSS_UTIL_URL=http://gosspublic.alicdn.com/ossutil/1.7.13/ossutilarm64 -ENV PACKAGE_DIR=/usr/src/third-party -RUN set -o pipefail && curl -s ${NG_URL} | bash - -RUN mkdir -p ${PACKAGE_DIR} -WORKDIR ${PACKAGE_DIR} - -COPY oss-upload.sh ${PACKAGE_DIR}/oss-upload.sh -RUN chmod +x ${PACKAGE_DIR}/oss-upload.sh - -RUN wget -q -O /usr/bin/ossutil64 ${OSS_UTIL_URL} -RUN chmod +x /usr/bin/ossutil64 diff --git a/docker/buildx/centos-7.Dockerfile b/docker/buildx/centos-7.Dockerfile index be870f0..2186c89 100644 --- a/docker/buildx/centos-7.Dockerfile +++ b/docker/buildx/centos-7.Dockerfile @@ -41,16 +41,6 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0 && ./cmake-3.20.0-linux-$(uname -m).sh --skip-license --prefix=/usr/local \ && rm cmake-3.20.0-linux-$(uname -m).sh -# Install libdwarf-20200114 -RUN wget --no-check-certificate https://www.prevanders.net/libdwarf-20200114.tar.gz \ - && tar -xzf libdwarf-20200114.tar.gz \ - && cd libdwarf-20200114 \ - && ./configure \ - && make \ - && make install \ - && cd .. \ - && rm -rf libdwarf-20200114 libdwarf-20200114.tar.gz - # Install ossutil RUN curl https://gosspublic.alicdn.com/ossutil/install.sh | bash diff --git a/docker/buildx/centos-8.Dockerfile b/docker/buildx/centos-8.Dockerfile index 2fb2073..ffbbc8e 100644 --- a/docker/buildx/centos-8.Dockerfile +++ b/docker/buildx/centos-8.Dockerfile @@ -42,16 +42,6 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0 && ./cmake-3.20.0-linux-$(uname -m).sh --skip-license --prefix=/usr/local \ && rm cmake-3.20.0-linux-$(uname -m).sh -# Install libdwarf-20200114 -RUN wget --no-check-certificate https://www.prevanders.net/libdwarf-20200114.tar.gz \ - && tar -xzf libdwarf-20200114.tar.gz \ - && cd libdwarf-20200114 \ - && ./configure \ - && make \ - && make install \ - && cd .. \ - && rm -rf libdwarf-20200114 libdwarf-20200114.tar.gz - # Install ossutil RUN curl https://gosspublic.alicdn.com/ossutil/install.sh | bash diff --git a/docker/buildx/rockylinux-8.Dockerfile b/docker/buildx/rockylinux-8.Dockerfile index 07f2c55..4f0e257 100644 --- a/docker/buildx/rockylinux-8.Dockerfile +++ b/docker/buildx/rockylinux-8.Dockerfile @@ -37,16 +37,6 @@ RUN wget https://github.com/Kitware/CMake/releases/download/v3.20.0/cmake-3.20.0 && ./cmake-3.20.0-linux-$(uname -m).sh --skip-license --prefix=/usr/local \ && rm cmake-3.20.0-linux-$(uname -m).sh -# Install libdwarf-20200114 -RUN wget --no-check-certificate https://www.prevanders.net/libdwarf-20200114.tar.gz \ - && tar -xzf libdwarf-20200114.tar.gz \ - && cd libdwarf-20200114 \ - && ./configure \ - && make \ - && make install \ - && cd .. \ - && rm -rf libdwarf-20200114 libdwarf-20200114.tar.gz - # Install ossutil RUN curl https://gosspublic.alicdn.com/ossutil/install.sh | bash diff --git a/docker/buildx/ubuntu-2004.Dockerfile b/docker/buildx/ubuntu-2004.Dockerfile index 8e5368f..ce4632f 100644 --- a/docker/buildx/ubuntu-2004.Dockerfile +++ b/docker/buildx/ubuntu-2004.Dockerfile @@ -28,7 +28,6 @@ RUN apt update \ gperf \ gettext \ ninja-build \ - libdwarf-dev \ && apt clean \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/buildx/ubuntu-2204.Dockerfile b/docker/buildx/ubuntu-2204.Dockerfile index b78de65..b6c125e 100644 --- a/docker/buildx/ubuntu-2204.Dockerfile +++ b/docker/buildx/ubuntu-2204.Dockerfile @@ -29,7 +29,6 @@ RUN apt update \ gperf \ gettext \ ninja-build \ - libdwarf-dev \ && apt clean \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/buildx/ubuntu-2304.Dockerfile b/docker/buildx/ubuntu-2304.Dockerfile deleted file mode 100644 index f79aba6..0000000 --- a/docker/buildx/ubuntu-2304.Dockerfile +++ /dev/null @@ -1,50 +0,0 @@ -FROM ubuntu:23.04 -SHELL ["/bin/bash", "-c"] -ARG DEBIAN_FRONTEND=noninteractive -RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone -RUN apt update \ - && apt install -y make \ - git \ - m4 \ - curl \ - wget \ - unzip \ - xz-utils \ - patch \ - python3 \ - python3-dev \ - lsb-release \ - zlib1g-dev \ - build-essential \ - libreadline-dev \ - libncurses-dev \ - cmake \ - libtool \ - automake \ - autoconf \ - autoconf-archive \ - autotools-dev \ - bison \ - flex \ - gperf \ - gettext \ - ninja-build \ - libdwarf-dev \ - && apt clean \ - && rm -rf /var/lib/apt/lists/* - -# Install ossutil -RUN curl https://gosspublic.alicdn.com/ossutil/install.sh | bash - -# Install MinIO Client -RUN if [ "$(uname -m)" = "aarch64" ]; then \ - curl -O https://dl.min.io/client/mc/release/linux-arm64/mc; \ - else \ - curl -O https://dl.min.io/client/mc/release/linux-amd64/mc; \ - fi \ - && chmod +x mc \ - && mv mc /usr/local/bin - -ENV PACKAGE_DIR=/usr/src/third-party -RUN mkdir -p ${PACKAGE_DIR} -WORKDIR ${PACKAGE_DIR} diff --git a/docker/x86_64/centos-7.Dockerfile b/docker/x86_64/centos-7.Dockerfile deleted file mode 100644 index 8f4f6bf..0000000 --- a/docker/x86_64/centos-7.Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ -FROM centos:7 -SHELL ["/bin/bash", "-c"] -RUN yum update -y -RUN yum install -y make \ - git \ - m4 \ - wget \ - unzip \ - xz \ - patch \ - python3 \ - python3-devel \ - python \ - python-devel \ - redhat-lsb-core \ - perl-Data-Dumper \ - perl-Thread-Queue \ - readline-devel \ - ncurses-devel \ - zlib-devel \ - gcc \ - gcc-c++ \ - cmake \ - libtool \ - autoconf \ - autoconf-archive \ - automake \ - bison \ - flex \ - which \ - gperf \ - gettext - -ENV NG_URL=https://raw.githubusercontent.com/dutor/nebula-gears/master/install -ENV OSS_UTIL_URL=http://gosspublic.alicdn.com/ossutil/1.7.13/ossutil64 -ENV PACKAGE_DIR=/usr/src/third-party -RUN curl -s ${NG_URL} | bash - -RUN mkdir -p ${PACKAGE_DIR} -WORKDIR ${PACKAGE_DIR} - -COPY oss-upload.sh ${PACKAGE_DIR}/oss-upload.sh -RUN chmod +x ${PACKAGE_DIR}/oss-upload.sh - -RUN wget -q -O /usr/bin/ossutil64 ${OSS_UTIL_URL} -RUN chmod +x /usr/bin/ossutil64 diff --git a/docker/x86_64/centos-8.Dockerfile b/docker/x86_64/centos-8.Dockerfile deleted file mode 100644 index bbadc4d..0000000 --- a/docker/x86_64/centos-8.Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -FROM centos:8 -SHELL ["/bin/bash", "-c"] -RUN cd /etc/yum.repos.d/ -RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* -RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* -RUN yum update -y -RUN yum install -y epel-release yum-utils -RUN yum config-manager --set-enabled powertools -RUN yum update -y -RUN yum install -y make \ - git \ - m4 \ - wget \ - unzip \ - xz \ - patch \ - python3 \ - python3-devel \ - redhat-lsb-core \ - perl-Data-Dumper \ - perl-Thread-Queue \ - readline-devel \ - ncurses-devel \ - zlib-devel \ - gcc \ - gcc-c++ \ - cmake \ - libtool \ - autoconf \ - autoconf-archive \ - automake \ - bison \ - flex \ - gperf \ - gettext - -ENV NG_URL=https://raw.githubusercontent.com/dutor/nebula-gears/master/install -ENV OSS_UTIL_URL=http://gosspublic.alicdn.com/ossutil/1.7.13/ossutil64 -ENV PACKAGE_DIR=/usr/src/third-party -RUN curl -s ${NG_URL} | bash - -RUN mkdir -p ${PACKAGE_DIR} -WORKDIR ${PACKAGE_DIR} - -COPY oss-upload.sh ${PACKAGE_DIR}/oss-upload.sh -RUN chmod +x ${PACKAGE_DIR}/oss-upload.sh - -RUN wget -q -O /usr/bin/ossutil64 ${OSS_UTIL_URL} -RUN chmod +x /usr/bin/ossutil64 diff --git a/docker/x86_64/ubuntu-1604.Dockerfile b/docker/x86_64/ubuntu-1604.Dockerfile deleted file mode 100644 index 4b2b8ca..0000000 --- a/docker/x86_64/ubuntu-1604.Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM ubuntu:16.04 -ARG DEBIAN_FRONTEND=noninteractive -SHELL ["/bin/bash", "-c"] -RUN apt-get clean -RUN apt-get update -RUN apt-get install -y make \ - git \ - m4 \ - wget \ - unzip \ - xz-utils \ - patch \ - python \ - curl \ - python-dev \ - lsb-core \ - libz-dev \ - build-essential \ - libreadline-dev \ - ncurses-dev \ - build-essential \ - cmake \ - libtool \ - automake \ - autoconf \ - autoconf-archive \ - autotools-dev \ - bison \ - flex \ - gperf \ - gettext - -ENV NG_URL=https://raw.githubusercontent.com/dutor/nebula-gears/master/install -ENV OSS_UTIL_URL=http://gosspublic.alicdn.com/ossutil/1.7.13/ossutil64 -ENV PACKAGE_DIR=/usr/src/third-party -RUN set -o pipefail && curl -s ${NG_URL} | bash - -RUN mkdir -p ${PACKAGE_DIR} -WORKDIR ${PACKAGE_DIR} - -COPY oss-upload.sh ${PACKAGE_DIR}/oss-upload.sh -RUN chmod +x ${PACKAGE_DIR}/oss-upload.sh - -RUN wget -q -O /usr/bin/ossutil64 ${OSS_UTIL_URL} -RUN chmod +x /usr/bin/ossutil64 diff --git a/docker/x86_64/ubuntu-1804.Dockerfile b/docker/x86_64/ubuntu-1804.Dockerfile deleted file mode 100644 index 1c2cd6a..0000000 --- a/docker/x86_64/ubuntu-1804.Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM ubuntu:18.04 -ARG DEBIAN_FRONTEND=noninteractive -SHELL ["/bin/bash", "-c"] -RUN apt-get clean -RUN apt-get update -RUN apt-get install -y make \ - git \ - m4 \ - wget \ - unzip \ - xz-utils \ - patch \ - python \ - curl \ - python-dev \ - lsb-core \ - libz-dev \ - build-essential \ - libreadline-dev \ - ncurses-dev \ - build-essential \ - cmake \ - libtool \ - automake \ - autoconf \ - autoconf-archive \ - autotools-dev \ - bison \ - flex \ - gperf \ - gettext - -ENV NG_URL=https://raw.githubusercontent.com/dutor/nebula-gears/master/install -ENV OSS_UTIL_URL=http://gosspublic.alicdn.com/ossutil/1.7.13/ossutil64 -ENV PACKAGE_DIR=/usr/src/third-party -RUN set -o pipefail && curl -s ${NG_URL} | bash - -RUN mkdir -p ${PACKAGE_DIR} -WORKDIR ${PACKAGE_DIR} - -COPY oss-upload.sh ${PACKAGE_DIR}/oss-upload.sh -RUN chmod +x ${PACKAGE_DIR}/oss-upload.sh - -RUN wget -q -O /usr/bin/ossutil64 ${OSS_UTIL_URL} -RUN chmod +x /usr/bin/ossutil64 diff --git a/docker/x86_64/ubuntu-2004.Dockerfile b/docker/x86_64/ubuntu-2004.Dockerfile deleted file mode 100644 index 79a2bdd..0000000 --- a/docker/x86_64/ubuntu-2004.Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM ubuntu:20.04 -SHELL ["/bin/bash", "-c"] -ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get clean -RUN apt-get update -RUN apt-get install -y make \ - git \ - m4 \ - wget \ - unzip \ - xz-utils \ - patch \ - python \ - curl \ - python-dev \ - lsb-core \ - libz-dev \ - build-essential \ - libreadline-dev \ - ncurses-dev \ - build-essential \ - cmake \ - libtool \ - automake \ - autoconf \ - autoconf-archive \ - autotools-dev \ - bison \ - flex \ - gperf \ - gettext - -ENV NG_URL=https://raw.githubusercontent.com/dutor/nebula-gears/master/install -ENV OSS_UTIL_URL=http://gosspublic.alicdn.com/ossutil/1.7.13/ossutil64 -ENV PACKAGE_DIR=/usr/src/third-party -RUN set -o pipefail && curl -s ${NG_URL} | bash - -RUN mkdir -p ${PACKAGE_DIR} -WORKDIR ${PACKAGE_DIR} - -COPY oss-upload.sh ${PACKAGE_DIR}/oss-upload.sh -RUN chmod +x ${PACKAGE_DIR}/oss-upload.sh - -RUN wget -q -O /usr/bin/ossutil64 ${OSS_UTIL_URL} -RUN chmod +x /usr/bin/ossutil64 diff --git a/docker/x86_64/ubuntu-2110.Dockerfile b/docker/x86_64/ubuntu-2110.Dockerfile deleted file mode 100644 index 62d75f2..0000000 --- a/docker/x86_64/ubuntu-2110.Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM ubuntu:21.10 -SHELL ["/bin/bash", "-c"] -ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get clean -RUN apt-get update -RUN apt-get install -y make \ - git \ - m4 \ - wget \ - unzip \ - xz-utils \ - patch \ - python2 \ - curl \ - python2-dev \ - lsb-core \ - zlib1g-dev \ - build-essential \ - libreadline-dev \ - libncurses-dev \ - build-essential \ - cmake \ - libtool \ - automake \ - autoconf \ - autoconf-archive \ - autotools-dev \ - bison \ - flex \ - gperf \ - gettext - -ENV NG_URL=https://raw.githubusercontent.com/dutor/nebula-gears/master/install -ENV OSS_UTIL_URL=http://gosspublic.alicdn.com/ossutil/1.7.13/ossutil64 -ENV PACKAGE_DIR=/usr/src/third-party -RUN set -o pipefail && curl -s ${NG_URL} | bash - -RUN mkdir -p ${PACKAGE_DIR} -WORKDIR ${PACKAGE_DIR} - -COPY oss-upload.sh ${PACKAGE_DIR}/oss-upload.sh -RUN chmod +x ${PACKAGE_DIR}/oss-upload.sh - -RUN wget -q -O /usr/bin/ossutil64 ${OSS_UTIL_URL} -RUN chmod +x /usr/bin/ossutil64 diff --git a/docker/x86_64/ubuntu-2204.Dockerfile b/docker/x86_64/ubuntu-2204.Dockerfile deleted file mode 100644 index 15079e5..0000000 --- a/docker/x86_64/ubuntu-2204.Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -FROM ubuntu:22.04 -SHELL ["/bin/bash", "-c"] -ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get clean -RUN apt-get update -RUN apt-get install -y make \ - git \ - m4 \ - wget \ - unzip \ - xz-utils \ - patch \ - python2 \ - curl \ - python2-dev \ - lsb-core \ - zlib1g-dev \ - build-essential \ - libreadline-dev \ - libncurses-dev \ - build-essential \ - cmake \ - libtool \ - automake \ - autoconf \ - autoconf-archive \ - autotools-dev \ - bison \ - flex \ - gperf \ - gettext - -ENV NG_URL=https://raw.githubusercontent.com/dutor/nebula-gears/master/install -ENV OSS_UTIL_URL=http://gosspublic.alicdn.com/ossutil/1.7.13/ossutil64 -ENV PACKAGE_DIR=/usr/src/third-party -RUN set -o pipefail && curl -s ${NG_URL} | bash - -RUN mkdir -p ${PACKAGE_DIR} -WORKDIR ${PACKAGE_DIR} - -COPY oss-upload.sh ${PACKAGE_DIR}/oss-upload.sh -RUN chmod +x ${PACKAGE_DIR}/oss-upload.sh - -RUN wget -q -O /usr/bin/ossutil64 ${OSS_UTIL_URL} -RUN chmod +x /usr/bin/ossutil64