Page MenuHomePhorge
Files F32215043

D6283.1765157632.diff
No OneTemporary
Actions

Size
1 KB
Referenced Files
None
Subscribers
None

D6283.1765157632.diff
View Options

diff --git a/keyserver/Dockerfile b/keyserver/Dockerfile
--- a/keyserver/Dockerfile
+++ b/keyserver/Dockerfile
@@ -49,13 +49,15 @@
# 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 \
rsync \
mariadb-client \
- protobuf-compiler \
&& rm -rf /var/lib/apt/lists/*
+# Installing protoc compiler
+COPY --chown=comm scripts/install_protobuf.sh scripts/
+RUN scripts/install_protobuf.sh
+
#-------------------------------------------------------------------------------
# STEP 2: DEVOLVE PRIVILEGES
# Create another user to run the rest of the commands
@@ -121,8 +123,12 @@
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"

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 8, 1:33 AM (17 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5846723
Default Alt Text
D6283.1765157632.diff (1 KB)

Event Timeline