diff options
| -rw-r--r-- | app/docker-compose.yml | 2 | ||||
| -rw-r--r-- | app/plume/build/plume/Dockerfile | 18 |
2 files changed, 9 insertions, 11 deletions
diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 79d4919..d24eaa3 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -79,7 +79,7 @@ services: build: context: ./plume/build/plume args: - VERSION: v0.7.0 + VERSION: 5424f9110f8749eb7d9f01b44ac8074fc13e0e68 image: superboum/plume:v3 postfix: diff --git a/app/plume/build/plume/Dockerfile b/app/plume/build/plume/Dockerfile index 4e05424..4e1401d 100644 --- a/app/plume/build/plume/Dockerfile +++ b/app/plume/build/plume/Dockerfile @@ -24,15 +24,14 @@ RUN git clone -n https://git.joinplu.me/Plume/Plume.git plume WORKDIR /opt/plume RUN git checkout ${VERSION} -RUN cargo install diesel_cli --no-default-features --features postgres --version '=1.3.0' - -# frontend -RUN cargo install cargo-web -RUN cargo web deploy -p plume-front --release -# backend -RUN cargo install --no-default-features --features postgres -f --path . -# cli -RUN cargo install --no-default-features --features postgres --path plume-cli +WORKDIR /opt/plume/script +RUN chmod a+x ./wasm-deps.sh && sleep 1 && ./wasm-deps.sh + +WORKDIR /opt/plume +RUN cargo install wasm-pack +RUN chmod a+x ./script/plume-front.sh && sleep 1 && ./script/plume-front.sh +RUN cargo install --path ./ --force --no-default-features --features postgres +RUN cargo install --path plume-cli --force --no-default-features --features postgres RUN cargo clean #----------------------------- @@ -46,7 +45,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ WORKDIR /app COPY --from=builder /opt/plume /app -COPY --from=builder /usr/local/cargo/bin/diesel /usr/local/bin/ COPY --from=builder /usr/local/cargo/bin/plm /usr/local/bin/ COPY --from=builder /usr/local/cargo/bin/plume /usr/local/bin/ COPY plm-start /usr/local/bin/ |