Fixed docker build arguments format

Signed-off-by: rkharisov <rinat@soramitsu.co.jp>
hyperledger · Jun 10, 2021 · 898e6e9 · 898e6e9
1 parent 13d6694
commit 898e6e9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/iroha2-dev.yml b/.github/workflows/iroha2-dev.yml
@@ -58,24 +58,24 @@ jobs:
           test -n "${{ secrets.DOCKERHUB_ORG }}"
           test -n "${{ secrets.DOCKERHUB_USERNAME }}"
           test -n "${{ secrets.DOCKERHUB_TOKEN }}"
-      - name: Build and push Iroha CLI Docker image
+      - name: Build and push Iroha Docker image
         uses: docker/build-push-action@v1.1.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
           repository: ${{ secrets.DOCKERHUB_ORG }}/iroha
           tags: iroha2-dev
-          build-args: |
+          build_args: |
             TARGET_DIR=release
             PROFILE=--release
-      - name: Build and push Iroha Client SCLI Docker image
+      - name: Build and push Iroha Client CLI Docker image
         uses: docker/build-push-action@v1.1.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
           repository: ${{ secrets.DOCKERHUB_ORG }}/iroha
           tags: iroha2-client-cli-dev
-          build-args: |
+          build_args: |
             BIN=iroha_client_cli
             TARGET_DIR=release
             PROFILE=--release
@@ -86,7 +86,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
           repository: ${{ secrets.DOCKERHUB_ORG }}/iroha
           tags: iroha2-crypto-cli-dev
-          build-args: |
+          build_args: |
             BIN=iroha_crypto_cli
             TARGET_DIR=release
             PROFILE=--release

diff --git a/.github/workflows/iroha2.yml b/.github/workflows/iroha2.yml
@@ -96,7 +96,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB }}
           repository: hyperledger/iroha
           tags: iroha2
-          build-args: |
+          build_args: |
             TARGET_DIR=release
             PROFILE=--release
       - name: Build and push Iroha CLI Docker image
@@ -106,7 +106,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB }}
           repository: hyperledger/iroha
           tags: iroha2-cli
-          build-args: |
+          build_args: |
             BIN=iroha_client_cli
             TARGET_DIR=release
             PROFILE=--release
@@ -117,7 +117,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB }}
           repository: hyperledger/iroha
           tags: iroha2-crypto-cli
-          build-args: |
+          build_args: |
             BIN=iroha_crypto_cli
             TARGET_DIR=release
             PROFILE=--release
diff --git a/iroha_client_cli/tests/test_config.json b/iroha_client_cli/tests/test_config.json
@@ -1,7 +1,6 @@
 {
   "TORII_CONFIGURATION": {
-    "TORII_URL": "127.0.0.1:1337",
-    "TORII_CONNECT_URL": "127.0.0.1:8888"
+    "TORII_URL": "127.0.0.1:1337"
   },
   "SUMERAGI_CONFIGURATION": {
     "TRUSTED_PEERS": [
@@ -31,4 +30,4 @@
   "INIT_CONFIGURATION": {
     "ROOT_PUBLIC_KEY": "ed01207233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0"
   }
-}
+}
diff --git a/iroha_dsl/tests/test_config.json b/iroha_dsl/tests/test_config.json
@@ -1,8 +1,7 @@
 {
   "TORII_CONFIGURATION": {
     "TORII_P2P_URL": "127.0.0.1:1337",
-    "TORII_API_URL": "127.0.0.1:8080",
-    "TORII_CONNECT_URL": "127.0.0.1:8888"
+    "TORII_API_URL": "127.0.0.1:8080"
   },
   "SUMERAGI_CONFIGURATION": {},
   "KURA_CONFIGURATION": {