From 0628a14be6beceb74d3da894e2fe55039c6354a9 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 15 May 2022 04:13:42 +0900 Subject: [PATCH 1/5] Use Rust image for buildenv --- .circleci/images/plume-buildenv/Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.circleci/images/plume-buildenv/Dockerfile b/.circleci/images/plume-buildenv/Dockerfile index 41ec8072..f71e6f88 100644 --- a/.circleci/images/plume-buildenv/Dockerfile +++ b/.circleci/images/plume-buildenv/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-20210208 +FROM rust:1-buster ENV PATH="/root/.cargo/bin:${PATH}" #install native/circleci/build dependancies @@ -10,11 +10,6 @@ RUN 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-pip zip unzip libclang-dev clang caddy&&\ rm -rf /var/lib/apt/lists/* -#install and configure rust -RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2021-11-27 -y &&\ - rustup component add rustfmt clippy &&\ - rustup component add rust-std --target wasm32-unknown-unknown - #compile some deps RUN cargo install wasm-pack &&\ cargo install grcov &&\ From 61f25941e87394e308703da973042eabdc8cd6d0 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 15 May 2022 04:17:17 +0900 Subject: [PATCH 2/5] Install crowdin CLI using apt in buildenv --- .circleci/images/plume-buildenv/Dockerfile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.circleci/images/plume-buildenv/Dockerfile b/.circleci/images/plume-buildenv/Dockerfile index f71e6f88..764bb7c4 100644 --- a/.circleci/images/plume-buildenv/Dockerfile +++ b/.circleci/images/plume-buildenv/Dockerfile @@ -6,8 +6,10 @@ RUN apt update &&\ apt install -y --no-install-recommends git ssh tar gzip ca-certificates default-jre&&\ echo "deb [trusted=yes] https://apt.fury.io/caddy/ /" \ | tee -a /etc/apt/sources.list.d/caddy-fury.list &&\ + 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-pip zip unzip libclang-dev clang caddy&&\ + 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-pip zip unzip libclang-dev clang caddy crowdin3 &&\ rm -rf /var/lib/apt/lists/* #compile some deps @@ -24,11 +26,3 @@ RUN pip3 install selenium #configure caddy COPY Caddyfile /Caddyfile - -#install crowdin -RUN mkdir /crowdin && cd /crowdin &&\ - curl -O https://downloads.crowdin.com/cli/v2/crowdin-cli.zip &&\ - unzip crowdin-cli.zip && rm crowdin-cli.zip &&\ - cd * && mv crowdin-cli.jar /usr/local/bin && cd && rm -rf /crowdin &&\ - /bin/echo -e '#!/bin/sh\njava -jar /usr/local/bin/crowdin-cli.jar $@' > /usr/local/bin/crowdin &&\ - chmod +x /usr/local/bin/crowdin From f151dee339624c2ae1170aa5e999129c457c0630 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 15 May 2022 04:45:27 +0900 Subject: [PATCH 3/5] Don't strip in buildenv --- .circleci/images/plume-buildenv/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/images/plume-buildenv/Dockerfile b/.circleci/images/plume-buildenv/Dockerfile index 764bb7c4..6858a988 100644 --- a/.circleci/images/plume-buildenv/Dockerfile +++ b/.circleci/images/plume-buildenv/Dockerfile @@ -15,7 +15,6 @@ RUN apt update &&\ #compile some deps RUN cargo install wasm-pack &&\ cargo install grcov &&\ - strip /root/.cargo/bin/* &&\ rm -fr ~/.cargo/registry #set some compilation parametters From ed58e44d2eeddd71e7fea72e5f373d1f59f668c2 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 15 May 2022 05:26:27 +0900 Subject: [PATCH 4/5] Use Python 3 to install Selenium --- .circleci/images/plume-buildenv/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/images/plume-buildenv/Dockerfile b/.circleci/images/plume-buildenv/Dockerfile index 6858a988..58785a08 100644 --- a/.circleci/images/plume-buildenv/Dockerfile +++ b/.circleci/images/plume-buildenv/Dockerfile @@ -9,7 +9,7 @@ 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-pip 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-venv python3-dev zip unzip libclang-dev clang caddy crowdin3 &&\ rm -rf /var/lib/apt/lists/* #compile some deps @@ -21,7 +21,7 @@ RUN cargo install wasm-pack &&\ COPY cargo_config /root/.cargo/config #install selenium for front end tests -RUN pip3 install selenium +RUN python3 -m venv .venv && bash -c "source .venv/bin/activate && pip3 install selenium" #configure caddy COPY Caddyfile /Caddyfile From e384fdfcff7ba122dffe30d3e4becff16a588489 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 15 May 2022 05:56:31 +0900 Subject: [PATCH 5/5] Update buildenv image to v0.5.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 05f0175e..6adfb3cd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ executors: type: boolean default: false docker: - - image: plumeorg/plume-buildenv:v0.4.0 + - image: plumeorg/plume-buildenv:v0.5.0 - image: <<#parameters.postgres>>cimg/postgres:14.2<><<^parameters.postgres>>alpine:latest<> environment: POSTGRES_USER: postgres