Skip to content

Commit 673f122

Browse files
outSHizuru0
authored andcommitted
refactor(cmd-socketio-server): remove code duplication
- Move config-reading and signMessageJwt helper functions from validators to cmd-socketio-server to remove code duplication. Refactor validators to use these common instead of own implementation. - Remove ValidatorAuthentication.ts that is not used anymore (not part of public interface, it was copied by validators during before couple commits ago). - Updated readme with instructions of how to start asset-trade and electricity-trade samples without docker-compose (to be used during development). Added helper script for patching the config. - Remove dependency on Indy SDK for the main build (it's needed only for running dockerless discounted-cartrade sample now) - Update legacy-socketio-connector Dockerfiles to work after updates. Signed-off-by: Michal Bajer <[email protected]>
1 parent 5bba7c0 commit 673f122

File tree

53 files changed

+688
-592
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+688
-592
lines changed

BUILD.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ The `npm run watch` script in action:
105105
* Docker Compose
106106
* OpenJDK (Corda support Java 8 JDK but do not currently support Java 9 or higher)
107107
* `sudo apt install openjdk-8-jdk-headless`
108-
* Indy SDK
108+
* Indy SDK (optional)
109109
* [Installing the SDK](https://github.com/hyperledger/indy-sdk#installing-the-sdk)
110110
* [Build the SDK from source](https://github.com/hyperledger/indy-sdk#how-to-build-indy-sdk-from-source)
111111

examples/cactus-example-discounted-asset-trade/Dockerfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM cactus-cmd-socketio-server:latest
22

33
ARG NPM_PKG_VERSION=latest
4+
ARG INDY_SDK_PKG_VERSION=1.16.0-dev-1649
45

56
ENV APP_HOME=/root/cactus
67

@@ -9,17 +10,17 @@ WORKDIR ${APP_HOME}
910
# Required by indy-sdk
1011
RUN apt-get update \
1112
&& apt-get install -y libsodium23 \
12-
libssl1.1 \
13-
libzmq5 \
13+
libssl1.1 \
14+
libzmq5 \
1415
&& rm -rf /var/lib/apt/lists/*
1516

1617
# Copy indy sdk lib from base ubuntu image
1718
# Note - indy_sdk:latest must be ABI compatible with this image OS
1819
COPY --from=indy-sdk-cli:latest /usr/lib/libindy.so /usr/lib/
1920

2021
COPY ./package.json ./dist/yarn.lock ./
21-
RUN yarn add "${CACTUS_CMD_SOCKETIO_PATH}" "@hyperledger/cactus-verifier-client@${NPM_PKG_VERSION}" \
22-
--production --ignore-engines --non-interactive --cache-folder ./.yarnCache && \
22+
RUN yarn add "${CACTUS_CMD_SOCKETIO_PATH}" "@hyperledger/cactus-verifier-client@${NPM_PKG_VERSION}" "indy-sdk@${INDY_SDK_PKG_VERSION}" \
23+
--production --ignore-engines --non-interactive --cache-folder ./.yarnCache && \
2324
rm -rf ./.yarnCache
2425

2526
COPY ./dist ./dist/

0 commit comments

Comments
 (0)