Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed docker build arguments format #1068

Merged
merged 1 commit into from Jun 10, 2021
Merged

Fixed docker build arguments format #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/iroha2-dev.yml
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/iroha2.yml
View file
Open in desktop
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
5 changes: 2 additions & 3 deletions iroha_client_cli/tests/test_config.json
View file
Open in desktop
@@ -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": [
Expand Down Expand Up @@ -31,4 +30,4 @@
"INIT_CONFIGURATION": {
"ROOT_PUBLIC_KEY": "ed01207233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0"
}
}
}
3 changes: 1 addition & 2 deletions iroha_dsl/tests/test_config.json
View file
Open in desktop
@@ -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": {
Expand Down