aboutsummaryrefslogtreecommitdiff
path: root/cluster/prod/app/plume/build
diff options
context:
space:
mode:
Diffstat (limited to 'cluster/prod/app/plume/build')
-rw-r--r--cluster/prod/app/plume/build/docker-compose.yml2
-rw-r--r--cluster/prod/app/plume/build/plume/Dockerfile19
2 files changed, 13 insertions, 8 deletions
diff --git a/cluster/prod/app/plume/build/docker-compose.yml b/cluster/prod/app/plume/build/docker-compose.yml
index 560f539..a621540 100644
--- a/cluster/prod/app/plume/build/docker-compose.yml
+++ b/cluster/prod/app/plume/build/docker-compose.yml
@@ -4,5 +4,5 @@ services:
build:
context: ./plume
args:
- VERSION: 8709f6cf9f8ff7e3c5ee7ea699ee7c778e92fefc
+ PLUME_VERSION: 61e65a55ad1f5094321c111e395d00dddcb05e96
image: superboum/plume:v8
diff --git a/cluster/prod/app/plume/build/plume/Dockerfile b/cluster/prod/app/plume/build/plume/Dockerfile
index 1f57a52..6e9d4f9 100644
--- a/cluster/prod/app/plume/build/plume/Dockerfile
+++ b/cluster/prod/app/plume/build/plume/Dockerfile
@@ -1,4 +1,5 @@
-FROM rust:1.58.1-slim-bullseye as builder
+#FROM rust:1.69-bullseye as builder
+FROM rustlang/rust:nightly-bullseye as builder
RUN apt-get update && \
apt-get install -y \
@@ -18,21 +19,25 @@ RUN apt-get update && \
libssl-dev \
libclang-dev
-ARG VERSION
+RUN cargo install wasm-pack
+
+ARG PLUME_VERSION
WORKDIR /opt
-RUN git clone -n https://git.joinplu.me/Plume/Plume.git plume
+RUN git clone -n https://git.joinplu.me/lx/Plume.git plume
WORKDIR /opt/plume
-RUN git checkout ${VERSION}
+RUN git checkout ${PLUME_VERSION}
+# Small style patch to make text column wider
+RUN git merge 397e3b4d9720475257817b322c05323d12918216
+RUN rm rust-toolchain
WORKDIR /opt/plume/script
RUN chmod a+x ./wasm-deps.sh && ./wasm-deps.sh
WORKDIR /opt/plume
-RUN cargo install wasm-pack
RUN chmod a+x ./script/plume-front.sh && ./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 install --path ./ --force --no-default-features --features postgres,s3
+RUN cargo install --path plume-cli --force --no-default-features --features postgres,s3
RUN cargo clean
#-----------------------------