Merge pull request 'Fix CI environment' (#843) from fix-ci-env into main

Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/843

.circleci/images/plume-buildenv/Caddyfile

@@ -1,6 +1,3 @@
-localhost:443 {
+localhost {
-  proxy / localhost:7878 {
+  reverse_proxy localhost:7878
-    transparent
-  }
-  tls self_signed
 }

.circleci/images/plume-buildenv/Dockerfile

@@ -4,11 +4,14 @@ ENV PATH="/root/.cargo/bin:${PATH}"
 #install native/circleci/build dependancies
 RUN apt update &&\
     apt install -y --no-install-recommends git ssh tar gzip ca-certificates default-jre&&\
-    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&&\
+    echo "deb [trusted=yes] https://apt.fury.io/caddy/ /" \
+    | tee -a /etc/apt/sources.list.d/caddy-fury.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&&\
     rm -rf /var/lib/apt/lists/*
 
 #install and configure rust
-RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2020-01-15 -y &&\
+RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2020-12-07 -y &&\
     rustup component add rustfmt clippy &&\
     rustup component add rust-std --target wasm32-unknown-unknown
 
@@ -24,8 +27,7 @@ COPY cargo_config /root/.cargo/config
 #install selenium for front end tests
 RUN pip3 install selenium
 
-#install and configure caddy
+#configure caddy
-RUN curl https://getcaddy.com | bash -s personal
 COPY Caddyfile /Caddyfile
 
 #install crowdin

script/run_browser_test.sh

@@ -10,7 +10,7 @@ plm instance new -d plume-test.local -n plume-test
 plm users new -n admin -N 'Admin' -e 'email@exemple.com' -p 'password'
 
 plume &
-caddy -conf /Caddyfile &
+caddy run -config /Caddyfile &
 
 until curl http://localhost:7878/test/health -f; do sleep 1; done 2>/dev/null >/dev/null