Skip to content

Commit

Permalink
Merge branch 'develop' into beta-to-develop
Browse files Browse the repository at this point in the history
  • Loading branch information
DmytroNazarenko committed Jun 23, 2023
2 parents 78e5db8 + f180af6 commit f57af8b
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 2 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ WORKDIR /ima
COPY proxy proxy
COPY agent agent
COPY npms npms
COPY postinstall-in-container.sh postinstall.sh
COPY package.json package.json
COPY VERSION VERSION

RUN mkdir /ima/bls_binaries
Expand Down
1 change: 0 additions & 1 deletion agent/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,4 @@ BASE_OPTIONS="--gas-price-multiplier=$GAS_PRICE_MULTIPLIER \
--no-expose-pwa"

echo "Running loop cmd..."
echo "Going to run: node $DIR/main.mjs --loop $BASE_OPTIONS"
node "$DIR/main.mjs" --loop "$BASE_OPTIONS"
2 changes: 1 addition & 1 deletion npms/skale-log/log.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export function createStandardOutputStream() {
"write": function( s ) {
const x =
this.strOwnIndent +
+ ( this.haveOwnTimestamps ? generateTimestampPrefix( null, true ) : "" ) +
( this.haveOwnTimestamps ? generateTimestampPrefix( null, true ) : "" ) +
s;
try {
if( this.objStream )
Expand Down
16 changes: 16 additions & 0 deletions postinstall-in-container.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash

echo " "
echo "----- installing in agent ------------------------------------------------------------------"
echo " "
cd ./agent
yarn install
cd ..

echo " "
echo "----- installing in proxy ------------------------------------------------------------------"
echo " "
cd ./proxy
yarn install
cd ..

0 comments on commit f57af8b

Please sign in to comment.