Merge pull request #31 from vechain/fix-compose-config

fix(compose): inspector:latest, pin deps
vechain · Sep 13, 2024 · f3aac60 · f3aac60
2 parents 0c36476 + a1db2da
commit f3aac60
Show file tree

Hide file tree

Showing 7 changed files with 1,262 additions and 34,067 deletions.
diff --git a/apps/backend/docker-compose.yml b/apps/backend/docker-compose.yml
@@ -1,14 +1,12 @@
-version: "3.9"
-
 services:
   proxy:
     container_name: proxy
     image: nginx:alpine
     ports:
-      - "80:80"
+      - '80:80'
     volumes:
       - ./nginx.conf:/etc/nginx/nginx.conf
-    restart: "unless-stopped"
+    restart: 'unless-stopped'
     networks:
       - backend
 
@@ -18,7 +16,7 @@ services:
       context: ./
       dockerfile: Dockerfile.dev
     ports:
-      - "3000:3000"
+      - '3000:3000'
     volumes:
       - ./:/app
       - /app/node_modules

diff --git a/apps/contracts/docker-compose.yaml b/apps/contracts/docker-compose.yaml
@@ -1,60 +1,58 @@
-version: "3.9"
-
 services:
-  thor-solo:
-    image: vechain/thor:latest
-    hostname: thor-solo
-    container_name: thor-solo
-    user: root
-    ports:
-      - 8669:8669
-    command:
-      - solo
-      - --on-demand # create new block when there is pending transaction
-      - --api-addr=0.0.0.0:8669 # Enable remote connections
-      - --api-cors=* # comma separated list of domains to accept cross origin requests to API
-      - --gas-limit=10000000000000 # block gas limit
-      - --api-call-gas-limit=10000000000000 # limit contract call gas
-      - --txpool-limit=100000000000  # limit txpool size
-      - --txpool-limit-per-account=256 # limit txpool size per account
-      - --cache=1024 # megabytes of ram allocated to trie nodes cache
-      - --data-dir=/data/thor # data directory
-      - --verbosity=9
-      - --persist
+    thor-solo:
+        image: vechain/thor:latest
+        hostname: thor-solo
+        container_name: thor-solo
+        user: root
+        ports:
+            - 8669:8669
+        command:
+            - solo
+            - --on-demand # create new block when there is pending transaction
+            - --api-addr=0.0.0.0:8669 # Enable remote connections
+            - --api-cors=* # comma separated list of domains to accept cross origin requests to API
+            - --gas-limit=10000000000000 # block gas limit
+            - --api-call-gas-limit=10000000000000 # limit contract call gas
+            - --txpool-limit=100000000000 # limit txpool size
+            - --txpool-limit-per-account=256 # limit txpool size per account
+            - --cache=1024 # megabytes of ram allocated to trie nodes cache
+            - --data-dir=/data/thor # data directory
+            - --verbosity=9
+            - --persist
 
-    healthcheck:
-      # We run the health check using standard UNIX tools so we don't have to
-      # install additional dependencies in the container.
-      test: wget -O- http://localhost:8669/blocks/0
-      interval: 5s
-      timeout: 10s
-      retries: 10
-    networks:
-      - vechain-thor
+        healthcheck:
+            # We run the health check using standard UNIX tools so we don't have to
+            # install additional dependencies in the container.
+            test: wget -O- http://localhost:8669/blocks/0
+            interval: 5s
+            timeout: 10s
+            retries: 10
+        networks:
+            - vechain-thor
 
-  insight:
-    image: ghcr.io/vechain/insight-app:master
-    hostname: insight
-    container_name: insight
-    environment:
-      - VUE_APP_SOLO_URL=http://localhost:8669
-    ports:
-      - "8080:80"
-    networks:
-      - vechain-thor
+    insight:
+        image: ghcr.io/vechain/insight-app:master
+        hostname: insight
+        container_name: insight
+        environment:
+            - VUE_APP_SOLO_URL=http://localhost:8669
+        ports:
+            - '8080:80'
+        networks:
+            - vechain-thor
 
-  inspector:
-    image: ghcr.io/vechain/inspector-app:master
-    hostname: inspector
-    container_name: inspector
-    environment:
-      - VUE_APP_SOLO_URL=http://localhost:8669
-    ports:
-      - "8081:80"
-    networks:
-      - vechain-thor
+    inspector:
+        image: ghcr.io/vechain/inspector-app:latest
+        hostname: inspector
+        container_name: inspector
+        environment:
+            - VUE_APP_SOLO_URL=http://localhost:8669
+        ports:
+            - '8081:80'
+        networks:
+            - vechain-thor
 
 networks:
-  vechain-thor:
-    driver: bridge
-    name: vechain-thor
+    vechain-thor:
+        driver: bridge
+        name: vechain-thor
diff --git a/apps/contracts/package.json b/apps/contracts/package.json
@@ -25,7 +25,7 @@
         "@types/mocha": ">=9.1.0",
         "chai": "^4.2.0",
         "dayjs": "^1.11.10",
-        "hardhat": "^2.12.6",
+        "hardhat": "^2.19.1",
         "hardhat-gas-reporter": "^1.0.8",
         "react-slot-counter": "^2.2.5",
         "solidity-coverage": "^0.8.1",
@@ -39,7 +39,6 @@
         "@typechain/ethers-v6": "^0.4.3",
         "@vechain/sdk-hardhat-plugin": "1.0.0-beta.30",
         "ethers": "^6.7.1",
-        "ganache-cli": "^6.12.2",
-        "hardhat": "^2.19.1"
+        "ganache-cli": "^6.12.2"
     }
 }