From f372282b040b42b4158da2d948dc1922c959827b Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Mon, 16 May 2022 12:20:06 +0900 Subject: [PATCH] Use apt package for setuptools instead of pyenv --- .circleci/images/plume-buildenv/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.circleci/images/plume-buildenv/Dockerfile b/.circleci/images/plume-buildenv/Dockerfile index 1e52bc5f..420f0354 100644 --- a/.circleci/images/plume-buildenv/Dockerfile +++ b/.circleci/images/plume-buildenv/Dockerfile @@ -9,12 +9,15 @@ RUN apt update &&\ wget -qO - https://artifacts.crowdin.com/repo/GPG-KEY-crowdin | apt-key add - &&\ echo "deb https://artifacts.crowdin.com/repo/deb/ /" > /etc/apt/sources.list.d/crowdin.list &&\ apt update &&\ - apt install -y --no-install-recommends binutils-dev build-essential cmake curl gcc gettext git libcurl4-openssl-dev libdw-dev libelf-dev libiberty-dev libpq-dev libsqlite3-dev libssl-dev make openssl pkg-config postgresql postgresql-contrib python zlib1g-dev python3-venv python3-dev zip unzip libclang-dev clang caddy crowdin3 &&\ + apt install -y --no-install-recommends binutils-dev build-essential cmake curl gcc gettext git libcurl4-openssl-dev libdw-dev libelf-dev libiberty-dev libpq-dev libsqlite3-dev libssl-dev make openssl pkg-config postgresql postgresql-contrib python zlib1g-dev python3-dev python3-pip python3-setuptools zip unzip libclang-dev clang caddy crowdin3 &&\ rm -rf /var/lib/apt/lists/* #stick rust environment COPY rust-toolchain ./ +#add rust toolchains +RUN rustup component add fmt && rustup component add clippy + #compile some deps RUN cargo install wasm-pack &&\ cargo install grcov &&\ @@ -24,7 +27,7 @@ RUN cargo install wasm-pack &&\ COPY cargo_config /root/.cargo/config #install selenium for front end tests -RUN python3 -m venv .venv && bash -c "source .venv/bin/activate && pip3 install selenium" +RUN pip3 install selenium #configure caddy COPY Caddyfile /Caddyfile