Merge pull request #177 from erikh/fix-vendored

Fix use of vendored feature in openssl dependency
zerotier · Mar 31, 2022 · 217569b · 217569b
2 parents 688ebd4 + 588a871
commit 217569b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -34,9 +34,12 @@ tracing = "0.1"
 tracing-log = "0.1"
 tracing-subscriber = "0.2"
 hex = ">=0"
-openssl = { version = ">= 0", features = [ "vendored" ] }
+openssl = ">= 0"
 async-trait = ">=0"
 
+[features]
+vendored-openssl = [ "openssl/vendored" ]
+
 [dev-dependencies]
 lazy_static = ">=0"
 

diff --git a/Dockerfile.alpine b/Dockerfile.alpine
@@ -16,7 +16,7 @@ RUN apk add openssl-dev
 COPY . /zeronsd
 WORKDIR /zeronsd
 
-RUN OPENSSL_NO_VENDOR=1 cargo install --path .
+RUN cargo install --release --path .
 
 FROM alpine:latest
 

diff --git a/cargo-docker.sh b/cargo-docker.sh
@@ -2,9 +2,9 @@
 
 if [ "${IS_LOCAL}" != 0 ]
 then
-  cargo install --path .
+  cargo install --release --path .
 else
-  cargo install --git https://github.com/zerotier/zeronsd \
+  cargo install --release --git https://github.com/zerotier/zeronsd \
     $(if [ "${IS_TAG}" != "0" ]; then echo "--tag"; else echo "--branch"; fi) \
     "${VERSION}"
 fi