From 922564a90b0109134d8806d099567328e423da60 Mon Sep 17 00:00:00 2001
From: Aaryamann Challani <43716372+rymnc@users.noreply.github.com>
Date: Mon, 24 Jul 2023 19:25:28 +0200
Subject: [PATCH] test(ci): rln-relay compilation in docker (#1853)

* test(ci): rln-relay compilation in docker

* fix(ci): make explicit digest in base image
---
 Dockerfile           | 5 +++--
 scripts/build_rln.sh | 2 +-
 vendor/zerokit       | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 900ceb7d3..1c5553f40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 # BUILD NIM APP ----------------------------------------------------------------
 
-FROM alpine:3.16 AS nim-build
+# alpine:edge supports building rust binaries, alpine:3.16 doesn't for some reason
+FROM alpine@sha256:880fafbab5a7602db21ac37f0d17088a29a9a48f98d581f01ce17312c22ccbb5  AS nim-build
 
 ARG NIMFLAGS
 ARG MAKE_TARGET=wakunode2
@@ -9,7 +10,7 @@ ARG NIM_COMMIT
 ARG LOG_LEVEL=TRACE
 
 # Get build tools and required header files
-RUN apk add --no-cache bash git cargo build-base pcre-dev linux-headers
+RUN apk add --no-cache bash git build-base pcre-dev linux-headers curl rust cargo
 
 WORKDIR /app
 COPY . .
diff --git a/scripts/build_rln.sh b/scripts/build_rln.sh
index f728fd5f8..b5adc9a59 100755
--- a/scripts/build_rln.sh
+++ b/scripts/build_rln.sh
@@ -26,6 +26,6 @@ then
 else
     echo "Failed to download $host_triplet-rln.tar.gz"
     # Build rln instead
-    cargo build --release --manifest-path "$build_dir/rln/Cargo.toml"
+    cargo build --release -p rln --manifest-path "$build_dir/rln/Cargo.toml"
     cp "$build_dir/target/release/librln.a" .
 fi
diff --git a/vendor/zerokit b/vendor/zerokit
index 8a365f0c9..c6b7a8c0a 160000
--- a/vendor/zerokit
+++ b/vendor/zerokit
@@ -1 +1 @@
-Subproject commit 8a365f0c9e5c4a744f70c5dd4904ce8d8f926c34
+Subproject commit c6b7a8c0a401dc9a3f5b0511ebfb8727fc19b53a