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.

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

Set the PROTOCOL_VERSION_DEFAULT when building quickstart #93

Merged
merged 5 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/Dockerfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ env:
PUSH_ENABLED: ${{ secrets.DOCKERHUB_TOKEN && github.ref_type == 'tag' && startsWith(github.ref_name, 'v') != true && 'true' || 'false' }}
IMAGE: ${{ format('{0}/{1}:{2}', secrets.DOCKERHUB_TOKEN && 'docker.io' || 'ghcr.io', github.repository, github.ref_type == 'tag' && github.ref_name || github.event.ref || 'latest') }}
CORE_GIT_REF: https://github.com/stellar/stellar-core.git#master
SOROBAN_RPC_GIT_REF: https://github.com/stellar/soroban-tools.git#main
SOROBAN_RPC_GIT_REF: https://github.com/stellar/soroban-rpc.git#main
RUST_TOOLCHAIN_VERSION: stable
SOROBAN_CLI_GIT_REF: https://github.com/stellar/soroban-tools.git#main
QUICKSTART_GIT_REF: https://github.com/stellar/quickstart.git#master
Expand Down
8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,14 @@ SOROBAN_CLI_STAGE_IMAGE=stellar/system-test-soroban-cli:dev
# The rest of these variables can be set as environment variables to the makefile
# to modify how system test is built.

# The default protocol version that the image should start with. Should
# typically be set to the maximum supported protocol version of all components.
# If not set will default to the core max supported protocol version in quickstart.
PROTOCOL_VERSION_DEFAULT=

# variables to set for source code, can be any valid docker context url local path github remote repo `https://github.com/repo#<ref>`
CORE_GIT_REF=https://github.com/stellar/stellar-core.git\#master
SOROBAN_RPC_GIT_REF=https://github.com/stellar/soroban-tools.git\#main
SOROBAN_RPC_GIT_REF=https://github.com/stellar/soroban-rpc.git\#main
SOROBAN_CLI_GIT_REF=https://github.com/stellar/soroban-tools.git\#main
GO_GIT_REF=https://github.com/stellar/go.git\#master
RS_XDR_GIT_REPO=https://github.com/stellar/rs-stellar-xdr
Expand Down Expand Up @@ -156,6 +161,7 @@ build-quickstart: build-core build-friendbot build-horizon build-rs-xdr build-so
SOURCE_URL=.; \
fi; \
docker build -t "$(QUICKSTART_STAGE_IMAGE)" \
--build-arg PROTOCOL_VERSION_DEFAULT=$$PROTOCOL_VERSION_DEFAULT \
--build-arg BUILDKIT_CONTEXT_KEEP_GIT_DIR=true \
--build-arg STELLAR_CORE_IMAGE_REF=$$CORE_IMAGE_REF \
--build-arg STELLAR_XDR_IMAGE_REF=$$RS_XDR_IMAGE_REF \
Expand Down
10 changes: 8 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
SOROBAN_CLI_CRATE_VERSION=? \
JS_STELLAR_SDK_NPM_VERSION=? \
NODE_VERSION=? \
PROTOCOL_VERSION_DEFAULT=? \
build
```

Expand Down Expand Up @@ -54,7 +55,7 @@
JS_STELLAR_SDK_NPM_VERSION=https://github.com/stellar/js-stellar-sdk.git#master
```

optional to set:
optional params to set:
```
# this will override SOROBAN_CLI_GIT_REF, and install soroban cli from crates repo instead
SOROBAN_CLI_CRATE_VERSION=0.4.0
Expand Down Expand Up @@ -95,9 +96,14 @@
# this will skip building friendbot from GO_GIT_REF and instead
# will use the bin already compiled at /app/friendbot in the existing docker image provided:
FRIENDBOT_IMAGE=<docker registry>/<docker image name>:<docker tag>

# set the default network protocol version which the internal core runtime built from `CORE_GIT_REF` should start with.
# Should typically be set to the maximum supported protocol version of all components.
# If not set or set to empty, will default to the core max supported protocol version defined in quickstart.
PROTOCOL_VERSION_DEFAULT=
```

Optional parameters to pass when running system-test image, `stellar/system-test:<tag>`:
Optional parameters to pass when running the system-test image, `stellar/system-test:<tag>`:

To specify git version of the smart contract source code used in soroban test fixtures.
`--SorobanExamplesGitHash {branch, tag, git commit hash}`
Expand Down
Loading