Rename libredisjson.so to match original rejson.so

gavrie · gavrie · commit 165afa44a7b0 · 2020-04-20T15:57:24.000+03:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -35,7 +35,9 @@ jobs:
 
       - run:
           name: Build all targets
-          command: cargo build --all --all-targets
+          command: |
+            cargo build --all --all-targets
+            mv target/debug/librejson.so target/debug/rejson.so
 
       #      - run:
       #          name: Nightly Build
@@ -59,6 +61,7 @@ jobs:
           name: Package
           command: |
             cargo build --all --all-targets --release
+            mv target/release/librejson.so target/release/rejson.so
             ramp pack -m ramp.yml -n RedisJSON -o ./target/release/$PACKAGE_NAME.{os}-{architecture}.$CIRCLE_BRANCH.zip ./target/release/$MODULE_ARTIFACT
 
       # - run:
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2018"
 
 [lib]
 crate-type = ["cdylib"]
+name = "rejson"
 
 [dependencies]
 bson = "0.14"
diff --git a/Dockerfile b/Dockerfile
@@ -2,6 +2,7 @@ FROM rust:latest as builder
 
 ENV LIBDIR /usr/lib/redis/modules
 ENV DEPS "python python-setuptools python-pip wget unzip build-essential clang-6.0 cmake"
+
 # Set up a build environment
 RUN set -ex;\
     deps="$DEPS";\
@@ -13,16 +14,15 @@ RUN set -ex;\
 ADD . /REJSON
 WORKDIR /REJSON
 RUN set -ex;\
-    cargo build --release; 
-    #pip install -r ./test/pytest/requirements.txt; \
-    #python ./test/pytest/test.py target/release/libredisjson.so;
+    cargo build --release;
+    mv target/release/librejson.so target/release/rejson.so
 
 # Package the runner
 FROM redis:latest
 ENV LIBDIR /usr/lib/redis/modules
 WORKDIR /data
 RUN set -ex;\
     mkdir -p "$LIBDIR";
-COPY --from=builder /REJSON/target/release/libredisjson.so  "$LIBDIR"
+COPY --from=builder /REJSON/target/release/rejson.so "$LIBDIR"
 
-CMD ["redis-server", "--loadmodule", "/usr/lib/redis/modules/libredisjson.so"]
+CMD ["redis-server", "--loadmodule", "/usr/lib/redis/modules/rejson.so"]
