Page MenuHomePhabricator
Files F3487152

D6283.id21357.diff
No OneTemporary
Actions

D6283.id21357.diff
View Options

diff --git a/keyserver/Dockerfile b/keyserver/Dockerfile
--- a/keyserver/Dockerfile
+++ b/keyserver/Dockerfile
@@ -49,11 +49,10 @@
# We need rsync in the prod-build yarn script
# We need mariadb-client so we can use mysqldump for backups
-# We need protobuf-compiler to build rust-node-addon
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+ cmake \
rsync \
mariadb-client \
- protobuf-compiler \
&& rm -rf /var/lib/apt/lists/*
#-------------------------------------------------------------------------------
@@ -115,14 +114,19 @@
keyserver/addons/rust-node-addon/
COPY --chown=comm native/expo-modules/android-lifecycle/package.json \
native/expo-modules/android-lifecycle/
+COPY --chown=comm scripts/install_protobuf.sh scripts/
# Create empty Rust library and copy in Cargo.toml file
RUN cargo init keyserver/addons/rust-node-addon --lib
COPY --chown=comm keyserver/addons/rust-node-addon/Cargo.toml \
keyserver/addons/rust-node-addon/
-# Copy in comm-opaque library, a dependency of rust-node-addon
+# Copy comm-opaque and tunnelbroker-client shared libraries for rust-node-addon
COPY --chown=comm shared/comm-opaque shared/comm-opaque/
+COPY --chown=comm shared/tunnelbroker-client shared/tunnelbroker-client/
+
+# Copy protobuf files as a dependency for the shared client libraries
+COPY --chown=comm shared/protos shared/protos/
# Copy in files needed for patch-package
COPY --chown=comm patches patches/
diff --git a/keyserver/addons/rust-node-addon/Cargo.toml b/keyserver/addons/rust-node-addon/Cargo.toml
--- a/keyserver/addons/rust-node-addon/Cargo.toml
+++ b/keyserver/addons/rust-node-addon/Cargo.toml
@@ -23,6 +23,7 @@
prost = "0.11"
comm-opaque = {path = "../../../shared/comm-opaque"}
lazy_static = "1.4"
+tunnelbroker-client = {path = "../../../shared/tunnelbroker-client"}
[build-dependencies]
napi-build = "2.0.1"
diff --git a/keyserver/addons/rust-node-addon/install_external_deps.sh b/keyserver/addons/rust-node-addon/install_external_deps.sh
--- a/keyserver/addons/rust-node-addon/install_external_deps.sh
+++ b/keyserver/addons/rust-node-addon/install_external_deps.sh
@@ -2,15 +2,6 @@
set -e
-echo "Buildkite var set: $BUILDKITE"
-
-# We can skip this script if it's not part of a CI workflow
-if ! { [ -n "$BUILDKITE" ] || [ -n "$CI" ]; }
-then
- echo "Not in a CI workflow, exiting"
- exit
-fi
-
# Install protobuf if it's not already installed
if [[ ! "$(command -v protoc)" ]]
then

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 19, 7:08 AM (20 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2675819
Default Alt Text
D6283.id21357.diff (2 KB)

Event Timeline