Release version to master

.dockerignore

@@ -7,3 +7,4 @@ test
 bfx-report-ui/build
 *Dockerfile*
 *docker-compose*
+terraform

Dockerfile.express

@@ -1,6 +1,6 @@
 FROM node:18.17.1-alpine3.18
 
-ENV BIND_HOST "0.0.0.0"
+ENV BIND_HOST="0.0.0.0"
 
 WORKDIR /home/node/bfx-report-express
 

Dockerfile.grenache-grape

@@ -1,6 +1,6 @@
 FROM node:18.17.1-alpine3.18
 
-ENV BIND_HOST "0.0.0.0"
+ENV BIND_HOST="0.0.0.0"
 
 WORKDIR /home/node/grenache-grape
 

Dockerfile.worker

@@ -1,34 +1,16 @@
-FROM node:18.17.1-alpine3.18
+FROM node:18.17.1-bookworm
 
 ARG GRC_VER="0.7.1"
 
 WORKDIR /home/node/grenache-cli
 
-RUN apk update && apk add --no-cache --virtual \
-  .gyp \
-  python3 \
-  make \
-  jq \
-  help2man \
-  gcc \
-  musl-dev \
-  autoconf \
-  automake \
-  libtool \
-  pkgconfig \
-  file \
-  patch \
-  bison \
-  clang \
-  flex \
-  curl \
-  perl \
-  perl-dev \
-  wget \
-  g++ \
-  git \
-  openssh \
-  bash
+RUN apt-get update -y \
+  && apt-get install -y --no-install-recommends \
+    jq \
+    xxd \
+    git \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
 
 RUN wget -c https://github.com/bitfinexcom/grenache-cli/releases/download/${GRC_VER}/grenache-cli-${GRC_VER}.tar.xz \
   && tar -xf grenache-cli-${GRC_VER}.tar.xz \

README.md

@@ -107,8 +107,8 @@ To simplify setup/deploy processes the following bash scripts are provided:
 
 The setup was tested with the following dependencies:
 
-- Docker version 20.10.12
-- docker-compose version 1.29.2
+- Docker version 27.2.0
+- docker-compose version 2.24.6
 - git version 2.24.1
 
 ### Setup process
@@ -225,7 +225,7 @@ The infrastructure configuration is located in the `./terraform` directory of th
 
 The setup was tested with the following dependencies:
 
-- Terraform version 1.1.7
+- Terraform version 1.9.5
 
 > To use Terraform you will need to install it. [This official tutorial](https://learn.hashicorp.com/tutorials/terraform/install-cli) will be useful to install Terraform.
 

docker-compose.yaml

@@ -1,9 +1,12 @@
-version: '3.9'
-
 x-common-variables: &common-variables
   API_PORT: "31339"
   GRAPE_APH: "30001"
   GRAPE_HOST: "grape1"
+x-logging: &default-logging
+  options:
+    max-size: "10m"
+    max-file: "10"
+  driver: json-file
 
 services:
   grape1:
@@ -20,6 +23,7 @@ services:
       GRAPE_BN: "20002"
       GRAPE_BIND: "grape2"
       NODE_ENV: ${NODE_ENV}
+    logging: *default-logging
 
   grape2:
     container_name: grape2
@@ -39,6 +43,7 @@ services:
       GRAPE_BN: "20001"
       GRAPE_BIND: "grape1"
       NODE_ENV: ${NODE_ENV}
+    logging: *default-logging
 
   worker:
     container_name: worker
@@ -69,6 +74,7 @@ services:
       SCHEDULER_RULE: ${SCHEDULER_RULE} # Non-required
       NGINX_AUTOINDEX: ${NGINX_AUTOINDEX} # Required
       NODE_ENV: ${NODE_ENV}
+    logging: *default-logging
 
   express:
     container_name: express
@@ -91,6 +97,7 @@ services:
     environment:
       <<: *common-variables
       NODE_ENV: ${NODE_ENV}
+    logging: *default-logging
 
   ui-builder:
     build:
@@ -103,6 +110,7 @@ services:
       CI_ENVIRONMENT_NAME: ${UI_ENV} # Non-required
       NGINX_HOST: ${NGINX_HOST} # Required
       NGINX_PORT: ${NGINX_PORT} # Non-required
+    logging: *default-logging
 
   nginx:
     container_name: nginx
@@ -133,6 +141,7 @@ services:
       NGINX_PORT: ${NGINX_PORT} # Non-required
       NGINX_ENV: ${NGINX_ENV} # Non-required
       NGINX_AUTOINDEX: ${NGINX_AUTOINDEX} # Required
+    logging: *default-logging
 
 networks:
   grapes:

locales/en/pdf.json

@@ -0,0 +1,14 @@
+{
+  "template": {
+    "startingPositionsSnapshot": "Starting positions snapshot",
+    "endingPositionsSnapshot": "Ending positions snapshot",
+    "finalState": "Final state",
+    "startingPeriodBalances": "Starting period balances",
+    "movementsDetails": "Movements details",
+    "endingPeriodBalances": "Ending period balances",
+    "positions": "Positions",
+    "wallets": "Wallets",
+    "positionsTickers": "Positions tickers",
+    "walletsTickers": "Wallets tickers"
+  }
+}

locales/es-EM/pdf.json

@@ -0,0 +1,14 @@
+{
+  "template": {
+    "startingPositionsSnapshot": "Captura de las posiciones iniciales",
+    "endingPositionsSnapshot": "Captura de las posiciones finales",
+    "finalState": "Estado final",
+    "startingPeriodBalances": "Balances al inicio del periodo",
+    "movementsDetails": "Detalles de Movimientos",
+    "endingPeriodBalances": "Balances al final del periodo",
+    "positions": "Posiciones",
+    "wallets": "Carteras",
+    "positionsTickers": "cotizaciones de las Posiciones",
+    "walletsTickers": "cotizaciones de las Carteras"
+  }
+}

locales/pt-BR/pdf.json

@@ -0,0 +1,14 @@
+{
+  "template": {
+    "startingPositionsSnapshot": "Captura das posições iniciais",
+    "endingPositionsSnapshot": "Captura das posições finais",
+    "finalState": "Estado final",
+    "startingPeriodBalances": "Saldos no início do período",
+    "movementsDetails": "Detalhes das movimentações",
+    "endingPeriodBalances": "Saldos no final do período",
+    "positions": "Posições",
+    "wallets": "Carteiras",
+    "positionsTickers": "cotações das posições",
+    "walletsTickers": "cotações das Carteiras"
+  }
+}

locales/ru/pdf.json

@@ -0,0 +1,14 @@
+{
+  "template": {
+    "startingPositionsSnapshot": "Снимок стартовых позиций",
+    "endingPositionsSnapshot": "Снимок конечных позиций",
+    "finalState": "Конечное состояние",
+    "startingPeriodBalances": "Остатки на начало периода",
+    "movementsDetails": "Детали движений",
+    "endingPeriodBalances": "Остатки на конец периода",
+    "positions": "Позиции",
+    "wallets": "Кошельки",
+    "positionsTickers": "Тикеры позиций",
+    "walletsTickers": "Тикеры кошельков"
+  }
+}

locales/tr/pdf.json

@@ -0,0 +1,14 @@
+{
+  "template": {
+    "startingPositionsSnapshot": "Pozisyonların Başlangıç Anlık Görüntüsü",
+    "endingPositionsSnapshot": "Pozisyonların Bitiş Anlık Görüntüsü",
+    "finalState": "Son Durum",
+    "startingPeriodBalances": "Başlangıç ​​Dönemi Bakiyeleri",
+    "movementsDetails": "Hareket Detayları",
+    "endingPeriodBalances": "Bitiş Dönemi Bakiyeleri",
+    "positions": "Poziyonlar",
+    "wallets": "Cüzdanlar",
+    "positionsTickers": "Pozisyon Tickerları",
+    "walletsTickers": "Cüzdan Tickerları"
+  }
+}

locales/zh-CN/pdf.json

@@ -0,0 +1,14 @@
+{
+  "template": {
+    "startingPositionsSnapshot": "仓位期初快照",
+    "endingPositionsSnapshot": "仓位期末快照",
+    "finalState": "最后状态",
+    "startingPeriodBalances": "期初余额",
+    "movementsDetails": "资金流向明细",
+    "endingPeriodBalances": "期末余额",
+    "positions": "仓位",
+    "wallets": "钱包",
+    "positionsTickers": "仓位牌价",
+    "walletsTickers": "钱包牌价"
+  }
+}

locales/zh-TW/pdf.json

@@ -0,0 +1,14 @@
+{
+  "template": {
+    "startingPositionsSnapshot": "倉位期初快照",
+    "endingPositionsSnapshot": "倉位期末快照",
+    "finalState": "最終狀態",
+    "startingPeriodBalances": "期初餘額",
+    "movementsDetails": "資金流向明細",
+    "endingPeriodBalances": "期末餘額",
+    "positions": "倉位",
+    "wallets": "錢包",
+    "positionsTickers": "倉位牌價",
+    "walletsTickers": "錢包牌價"
+  }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bfx-reports-framework",
-  "version": "4.20.0",
+  "version": "4.21.0",
   "description": "Bitfinex reports framework",
   "main": "worker.js",
   "license": "Apache-2.0",

scripts/deploy.sh

@@ -6,6 +6,9 @@ SCRIPTPATH="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)"
 ROOT="$(dirname "$SCRIPTPATH")"
 CURRDIR="$PWD"
 
+DOCKER_COMPOSE_CMD=("docker" "compose")
+"${DOCKER_COMPOSE_CMD[@]}" version 2>/dev/null || DOCKER_COMPOSE_CMD=("docker-compose")
+
 if [ -n "${1:-}" ] && [[ "$1" =~ ^SECRET_KEY= ]]; then
   export SECRET_KEY=$(echo $1| cut -d'=' -f 2)
 fi
@@ -15,7 +18,7 @@ maintenanceFileFlag="$ROOT/scripts/maintenance/maintenance.on"
 "$ROOT/scripts/sync-repo.sh" "-a"
 
 cd "$ROOT"
-runningServices=$(docker-compose ps --filter "status=running" --services)
+runningServices=$("${DOCKER_COMPOSE_CMD[@]}" ps --filter "status=running" --services)
 isNginxRunning=$(echo "$runningServices" | { grep 'nginx' || test $? = 1; } | wc -l)
 
 touch "$maintenanceFileFlag"

scripts/launch.sh

@@ -11,6 +11,11 @@ COLOR_GREEN="\033[32m"
 COLOR_BLUE="\033[34m"
 COLOR_NORMAL="\033[39m"
 
+DOCKER_COMPOSE_CMD=("docker" "compose")
+"${DOCKER_COMPOSE_CMD[@]}" version 2>/dev/null || DOCKER_COMPOSE_CMD=("docker-compose")
+echo "0-DOCKER_COMPOSE_CMD"
+declare -p DOCKER_COMPOSE_CMD
+
 programname=$0
 
 launchAll=0
@@ -83,11 +88,13 @@ composeCommonFlags="\
   --force-recreate \
   --remove-orphans \
   --timeout 2 \
+  --timestamps \
+  --wait-timeout 180
   $detachedMode \
 "
 
 if [ $launchAll == 1 ]; then
-  docker-compose up $composeCommonFlags \
+  "${DOCKER_COMPOSE_CMD[@]}" up $composeCommonFlags \
 
   cd "$CURRDIR"
   exit 0
@@ -101,7 +108,7 @@ if [ $launchGrapes == 1 ]; then
   grapesServices="grape1 grape2"
 fi
 if [ $launchWorker == 1 ]; then
-  runningServices=$(docker-compose ps --filter "status=running" --services)
+  runningServices=$("${DOCKER_COMPOSE_CMD[@]}" ps --filter "status=running" --services)
   isGrape1Running=$(echo "$runningServices" | { grep 'grape1' || test $? = 1; } | wc -l)
   isGrape2Running=$(echo "$runningServices" | { grep 'grape2' || test $? = 1; } | wc -l)
 
@@ -123,15 +130,15 @@ if [ $launchGrapes == 1 ] \
   || [ $launchExpress == 1 ]
 then
   grapesServices="$(echo -e "${grapesServices}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
-  docker-compose up $composeCommonFlags \
+  "${DOCKER_COMPOSE_CMD[@]}" up $composeCommonFlags \
     $grapesServices $workerService $expressService
 fi
 if [ $launchNginx == 1 ]; then
-  docker-compose up $composeCommonFlags --no-deps \
+  "${DOCKER_COMPOSE_CMD[@]}" up $composeCommonFlags --no-deps \
     nginx
 fi
 if [ $buildUI == 1 ]; then
-  docker-compose up $composeCommonFlags --no-deps \
+  "${DOCKER_COMPOSE_CMD[@]}" up $composeCommonFlags --no-deps \
     ui-builder
 fi
 

scripts/setup.sh

@@ -175,7 +175,10 @@ ${COLOR_NORMAL}" >&2
   fi
 fi
 
-if ! docker-compose --version; then
+DOCKER_COMPOSE_CMD=("docker" "compose")
+"${DOCKER_COMPOSE_CMD[@]}" version 2>/dev/null || DOCKER_COMPOSE_CMD=("docker-compose")
+
+if ! "${DOCKER_COMPOSE_CMD[@]}" version; then
   echo -e "\
 \n${COLOR_RED}Docker-compose has not been found\
 ${COLOR_NORMAL}" >&2
@@ -184,11 +187,11 @@ ${COLOR_NORMAL}" >&2
     # Install Compose on Linux systems
     # https://docs.docker.com/compose/install/#install-compose-on-linux-systems
 
-    curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+    curl -SL https://github.com/docker/compose/releases/download/v2.29.2/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
     chmod +x /usr/local/bin/docker-compose
     ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose 2>/dev/null
 
-    docker-compose --version
+    docker-compose version
   fi
 fi