Fix docker build

Signed-off-by: Miroslav Kovar <miroslav.kovar@absa.africa>
hyperledger · Sep 16, 2022 · c7b8d5d · c7b8d5d
1 parent 172cd34
commit c7b8d5d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/ci/alpine_core.dockerfile b/ci/alpine_core.dockerfile
@@ -30,7 +30,7 @@ ENV PATH="/home/indy/.cargo/bin:$PATH" RUSTFLAGS="-C target-feature=-crt-static"
 
 RUN git clone $INDYSDK_REPO && cd $INDYSDK_PATH && git checkout $INDYSDK_REVISION
 
-RUN cargo build --release --manifest-path=$INDYSDK_PATH/libindy/Cargo.toml
+RUN cargo build --release --manifest-path=$INDYSDK_PATH/libvdrtools/Cargo.toml
 
 USER root
-RUN mv $INDYSDK_PATH/libindy/target/release/libindy.so /usr/lib
+RUN mv $INDYSDK_PATH/libvdrtools/target/release/libvdrtools.so /usr/lib
diff --git a/ci/libvcx-codecov.dockerfile b/ci/libvcx-codecov.dockerfile
@@ -3,8 +3,8 @@ FROM ubuntu:18.04 as BASE
 ARG UID=1000
 
 ARG INDYSDK_PATH=/home/indy/vdr-tools
-ARG INDYSDK_REVISION=b5fd711a
-ARG INDYSDK_REPO=https://gitlab.com/PatrikStas/vdr-tools.git
+ARG INDYSDK_REVISION=c1390f91
+ARG INDYSDK_REPO=https://gitlab.com/mirgee/vdr-tools.git
 ARG RUST_VER=nightly-2022-05-21
 
 # Install dependencies
@@ -46,10 +46,10 @@ ENV PATH /home/indy/.cargo/bin:$PATH
 # Clone and build indy-sdk
 WORKDIR /home/indy
 RUN git clone $INDYSDK_REPO && cd $INDYSDK_PATH && git checkout $INDYSDK_REVISION
-RUN cargo build --release --manifest-path=$INDYSDK_PATH/libindy/Cargo.toml
+RUN cargo build --release --manifest-path=$INDYSDK_PATH/libvdrtools/Cargo.toml
 
 USER root
-RUN mv $INDYSDK_PATH/libindy/target/release/*.so /usr/lib
+RUN mv $INDYSDK_PATH/libvdrtools/target/release/*.so /usr/lib
 
 # Build indy binaries and move to system library
 USER indy

diff --git a/ci/libvcx-tester.dockerfile b/ci/libvcx-tester.dockerfile
@@ -19,7 +19,7 @@ ARG GID=1000
 
 RUN addgroup -g $GID node && adduser -u $UID -D -G node node
 
-COPY --from=builder /usr/lib/libindy.so /home/indy/lib*.so /usr/lib/
+COPY --from=builder /usr/lib/libvdrtools.so /home/indy/lib*.so /usr/lib/
 
 WORKDIR /home/node
 COPY --chown=node ./libvcx ./libvcx

diff --git a/ci/libvcx.dockerfile b/ci/libvcx.dockerfile
@@ -17,7 +17,7 @@ ARG UID=1000
 ARG GID=1000
 RUN addgroup -g $GID node && adduser -u $UID -D -G node node
 
-COPY --from=builder /usr/lib/libindy.so /home/indy/lib*.so /usr/lib/
+COPY --from=builder /usr/lib/libvdrtools.so /home/indy/lib*.so /usr/lib/
 
 WORKDIR /home/node
 RUN apk update && apk upgrade

diff --git a/wrappers/ios/ci/build.sh b/wrappers/ios/ci/build.sh
@@ -159,7 +159,7 @@ build_libindy() {
     echo "ios/ci/build.sh: running build_libindy()"
     TRIPLETS="aarch64-apple-ios,x86_64-apple-ios"
 
-    pushd $INDY_SDK_DIR/libindy
+    pushd $INDY_SDK_DIR/libvdrtools
         cargo lipo --release --targets="${TRIPLETS}"
     popd
 }
@@ -177,7 +177,7 @@ copy_libindy_architectures() {
         echo TRIPLET=$TRIPLET
 
         mkdir -p $OUTPUT_DIR/libs/$LIB_NAME/$ARCH
-        cp -v $INDY_SDK_DIR/libindy/target/$TRIPLET/release/libindy.a $OUTPUT_DIR/libs/$LIB_NAME/$ARCH/libindy.a
+        cp -v $INDY_SDK_DIR/libvdrtools/target/$TRIPLET/release/libvdrtools.a $OUTPUT_DIR/libs/$LIB_NAME/$ARCH/libvdrtools.a
     done
 }
 
@@ -251,7 +251,7 @@ combine_libs() {
     ARCHS="arm64 x86_64"
     combined_libs_paths=""
     for arch in ${ARCHS[*]}; do
-        libraries="libsodium libzmq libvcx" # libssl, libcrypto, libindy were statically linked into libvcx during its build (see libvcx/build.rs)
+        libraries="libsodium libzmq libvdrtools" # libssl, libcrypto, libindy were statically linked into libvcx during its build (see libvcx/build.rs)
 
         libs_to_combine_paths=""
         for library in ${libraries[*]}; do