kylefang/stacks-subnets
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-subnets.git synced 2026-01-12 08:34:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: update server_version

Browse Source 
The `/v2/info` endpoint is updated to report "subnet-node" instead of
"stacks-node".
This commit is contained in:
Brice Dobry
2023-03-08 21:32:11 -05:00
committed by Brice Dobry
parent 7012d2228d
commit ca1d9c0e8b
13 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@@ -238,7 +238,7 @@ jobs:
tags: ${{ env.STRETCH_TAG }}
tag_with_ref: false
add_git_labels: true
build_args: STACKS_NODE_VERSION=${{ github.event.inputs.tag || env.GITHUB_SHA_SHORT }},GIT_BRANCH=${{ env.GITHUB_REF_SHORT }},GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
build_args: SUBNET_NODE_VERSION=${{ github.event.inputs.tag || env.GITHUB_SHA_SHORT }},GIT_BRANCH=${{ env.GITHUB_REF_SHORT }},GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
# Only push if a tag was passed in
push: ${{ github.event.inputs.tag != '' }}
@@ -282,6 +282,6 @@ jobs:
tags: ${{ env.STRETCH_TAG }}
tag_with_ref: false
add_git_labels: true
build_args: STACKS_NODE_VERSION=${{ github.event.inputs.tag || env.GITHUB_SHA_SHORT }},GIT_BRANCH=${{ env.GITHUB_REF_SHORT }},GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
build_args: SUBNET_NODE_VERSION=${{ github.event.inputs.tag || env.GITHUB_SHA_SHORT }},GIT_BRANCH=${{ env.GITHUB_REF_SHORT }},GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
# Only push if a tag was passed in
push: ${{ github.event.inputs.tag != '' }}

4
.github/workflows/docker-platforms.yml vendored
View File

@@ -59,7 +59,7 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
STACKS_NODE_VERSION=${{ inputs.tag || env.GITHUB_SHA_SHORT }}
SUBNET_NODE_VERSION=${{ inputs.tag || env.GITHUB_SHA_SHORT }}
GIT_BRANCH=${{ env.GITHUB_REF_SHORT }}
GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
push: true
@@ -119,7 +119,7 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
STACKS_NODE_VERSION=${{ inputs.tag || env.GITHUB_SHA_SHORT }}
SUBNET_NODE_VERSION=${{ inputs.tag || env.GITHUB_SHA_SHORT }}
GIT_BRANCH=${{ env.GITHUB_REF_SHORT }}
GIT_COMMIT=${{ env.GITHUB_SHA_SHORT }}
push: true

2
Dockerfile
View File

@@ -1,6 +1,6 @@
FROM rust:bullseye as build
ARG STACKS_NODE_VERSION="No Version Info"
ARG SUBNET_NODE_VERSION="No Version Info"
ARG GIT_BRANCH='No Branch Info'
ARG GIT_COMMIT='No Commit Info'

2
Dockerfile.stretch
View File

@@ -1,6 +1,6 @@
FROM rust:stretch as build
ARG STACKS_NODE_VERSION="No Version Info"
ARG SUBNET_NODE_VERSION="No Version Info"
ARG GIT_BRANCH='No Branch Info'
ARG GIT_COMMIT='No Commit Info'

2
build-scripts/Dockerfile.linux-arm64
View File

@@ -1,6 +1,6 @@
FROM rust:stretch as build
ARG STACKS_NODE_VERSION="No Version Info"
ARG SUBNET_NODE_VERSION="No Version Info"
ARG GIT_BRANCH='No Branch Info'
ARG GIT_COMMIT='No Commit Info'

2
build-scripts/Dockerfile.linux-armv7
View File

@@ -1,6 +1,6 @@
FROM rust:stretch as build
ARG STACKS_NODE_VERSION="No Version Info"
ARG SUBNET_NODE_VERSION="No Version Info"
ARG GIT_BRANCH='No Branch Info'
ARG GIT_COMMIT='No Commit Info'

2
build-scripts/Dockerfile.linux-musl-x64
View File

@@ -1,6 +1,6 @@
FROM rust:stretch as build
ARG STACKS_NODE_VERSION="No Version Info"
ARG SUBNET_NODE_VERSION="No Version Info"
ARG GIT_BRANCH='No Branch Info'
ARG GIT_COMMIT='No Commit Info'

2
build-scripts/Dockerfile.linux-x64
View File

@@ -1,6 +1,6 @@
FROM rust:stretch as build
ARG STACKS_NODE_VERSION="No Version Info"
ARG SUBNET_NODE_VERSION="No Version Info"
ARG GIT_BRANCH='No Branch Info'
ARG GIT_COMMIT='No Commit Info'

2
build-scripts/Dockerfile.macos-arm64
View File

@@ -1,6 +1,6 @@
FROM rust:bullseye as build
ARG STACKS_NODE_VERSION="No Version Info"
ARG SUBNET_NODE_VERSION="No Version Info"
ARG GIT_BRANCH='No Branch Info'
ARG GIT_COMMIT='No Commit Info'

2
build-scripts/Dockerfile.macos-x64
View File

@@ -1,6 +1,6 @@
FROM rust:bullseye as build
ARG STACKS_NODE_VERSION="No Version Info"
ARG SUBNET_NODE_VERSION="No Version Info"
ARG GIT_BRANCH='No Branch Info'
ARG GIT_COMMIT='No Commit Info'

2
build-scripts/Dockerfile.windows-x64
View File

@@ -1,6 +1,6 @@
FROM rust:stretch as build
ARG STACKS_NODE_VERSION="No Version Info"
ARG SUBNET_NODE_VERSION="No Version Info"
ARG GIT_BRANCH='No Branch Info'
ARG GIT_COMMIT='No Commit Info'

4
src/net/rpc.rs
View File

@@ -219,8 +219,8 @@ impl RPCPeerInfoData {
genesis_chainstate_hash: &Sha256Sum,
) -> RPCPeerInfoData {
let server_version = version_string(
"stacks-node",
option_env!("STACKS_NODE_VERSION")
"subnet-node",
option_env!("SUBNET_NODE_VERSION")
.or(option_env!("CARGO_PKG_VERSION"))
.unwrap_or("0.0.0.0"),
);

4
testnet/stacks-node/src/main.rs
View File

@@ -149,8 +149,8 @@ fn main() {
fn version() -> String {
stacks::version_string(
"stacks-node",
option_env!("STACKS_NODE_VERSION")
"subnet-node",
option_env!("SUBNET_NODE_VERSION")
.or(option_env!("CARGO_PKG_VERSION"))
.unwrap_or("0.0.0.0"),
)