Browse Source

Use Caddy v2 on build env

tags/0.6.0
Kitaiti Makoto 2 months ago
parent
commit
55abbff9b8
3 changed files with 8 additions and 9 deletions
  1. +2
    -5
      .circleci/images/plume-buildenv/Caddyfile
  2. +5
    -3
      .circleci/images/plume-buildenv/Dockerfile
  3. +1
    -1
      script/run_browser_test.sh

+ 2
- 5
.circleci/images/plume-buildenv/Caddyfile View File

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

+ 5
- 3
.circleci/images/plume-buildenv/Dockerfile View File

@@ -4,7 +4,10 @@ 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
@@ -24,8 +27,7 @@ COPY cargo_config /root/.cargo/config
#install selenium for front end tests
RUN pip3 install selenium

#install and configure caddy
RUN curl https://getcaddy.com | bash -s personal
#configure caddy
COPY Caddyfile /Caddyfile

#install crowdin


+ 1
- 1
script/run_browser_test.sh View File

@@ -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



Loading…
Cancel
Save