From 4cd9d9e2cb2927b274c7208218cbfd03c192156f Mon Sep 17 00:00:00 2001 From: Kaoru Date: Sun, 6 Oct 2024 07:55:51 +0000 Subject: [PATCH] ci: update ubuntu image --- docker/ubuntu-arm64.dockerfile | 2 +- docker/ubuntu-x64.dockerfile | 2 +- scripts/install_asio_standalone.sh | 23 ----------------------- scripts/install_darwin_deps.sh | 10 ---------- scripts/install_fedora_deps.sh | 13 ------------- scripts/install_ubuntu_deps.sh | 16 ---------------- 6 files changed, 2 insertions(+), 64 deletions(-) delete mode 100755 scripts/install_asio_standalone.sh delete mode 100755 scripts/install_darwin_deps.sh delete mode 100755 scripts/install_fedora_deps.sh delete mode 100755 scripts/install_ubuntu_deps.sh diff --git a/docker/ubuntu-arm64.dockerfile b/docker/ubuntu-arm64.dockerfile index 43e68c7e95..aa2f634226 100644 --- a/docker/ubuntu-arm64.dockerfile +++ b/docker/ubuntu-arm64.dockerfile @@ -7,7 +7,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN yes | unminimize && \ # bash ./tmp/install_deps.sh && \ - apt install -y --no-install-recommends curl zip unzip tar git mysql-client postgresql-client sqlite3 python3-pip doxygen && \ + apt install -y --no-install-recommends cmake curl zip unzip tar git g++ mysql-client postgresql-client sqlite3 python3-pip doxygen pkg-config bison flex autoconf ninja-build && \ apt autoremove -y && \ rm -rf /var/lib/apt/lists/* diff --git a/docker/ubuntu-x64.dockerfile b/docker/ubuntu-x64.dockerfile index a31733692e..12a9db4195 100644 --- a/docker/ubuntu-x64.dockerfile +++ b/docker/ubuntu-x64.dockerfile @@ -17,7 +17,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN yes | unminimize && \ # bash ./tmp/install_deps.sh && \ - apt install -y --no-install-recommends curl zip unzip tar git mysql-client postgresql-client sqlite3 python3-pip doxygen && \ + apt install -y --no-install-recommends cmake curl zip unzip tar git g++ mysql-client postgresql-client sqlite3 python3-pip doxygen pkg-config bison flex autoconf ninja-build && \ apt autoremove -y && \ rm -rf /var/lib/apt/lists/* diff --git a/scripts/install_asio_standalone.sh b/scripts/install_asio_standalone.sh deleted file mode 100755 index aeb604dd86..0000000000 --- a/scripts/install_asio_standalone.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -target_directory="__asio__" - -if [ -d "$target_directory" ]; then - echo "Error: The directory '$target_directory' already exists." - exit 1 -fi - -clone_url="https://github.com/chriskohlhoff/asio" -git clone --depth 1 "$clone_url" "$target_directory" || { echo "Error: Cloning failed."; exit 1; } - -cd "$target_directory/asio" || { echo "Error: Changing directory failed."; exit 1; } - -./autogen.sh || { echo "Error: Running autogen.sh failed."; cd ../..; rm -rf "$target_directory"; exit 1; } -./configure || { echo "Error: Running configure failed."; cd ../..; rm -rf "$target_directory"; exit 1; } -make install -j 4 || { echo "Error: Compilation failed."; cd ../..; rm -rf "$target_directory"; exit 1; } - -cd ../.. - -rm -rf "$target_directory" - -echo "Success: asio installed and compiled successfully!" diff --git a/scripts/install_darwin_deps.sh b/scripts/install_darwin_deps.sh deleted file mode 100755 index f473492978..0000000000 --- a/scripts/install_darwin_deps.sh +++ /dev/null @@ -1,10 +0,0 @@ -brew install --quiet \ - openssl \ - libarchive \ - googletest \ - google-benchmark \ - sqlite3 \ - mysql-client \ - mysql \ - libpq \ - asio \ No newline at end of file diff --git a/scripts/install_fedora_deps.sh b/scripts/install_fedora_deps.sh deleted file mode 100755 index 87a8162fc6..0000000000 --- a/scripts/install_fedora_deps.sh +++ /dev/null @@ -1,13 +0,0 @@ -dnf install -yq \ - gcc \ - g++ \ - cmake \ - ninja-build \ - sqlite-devel \ - community-mysql-devel \ - libpq-devel \ - gtest-devel \ - google-benchmark-devel \ - libarchive-devel \ - asio-devel \ - libunwind-devel diff --git a/scripts/install_ubuntu_deps.sh b/scripts/install_ubuntu_deps.sh deleted file mode 100755 index 5e34d4ab39..0000000000 --- a/scripts/install_ubuntu_deps.sh +++ /dev/null @@ -1,16 +0,0 @@ -apt install -yq --no-install-recommends \ - cmake \ - gcc \ - g++ \ - ninja-build \ - libgtest-dev \ - libbenchmark-dev \ - python3 \ - libarchive-dev \ - libssl-dev \ - zlib1g-dev \ - libsqlite3-dev \ - libmysqlclient-dev \ - libpq-dev \ - libasio-dev \ - libunwind-dev