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

Update Dockerfile and Makefile to refer rpc instead of tools #74

Merged
merged 2 commits into from
Feb 21, 2024
Merged

Update Dockerfile and Makefile to refer rpc instead of tools #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b2b538
Update Dockerfile and Makefile to refer rpc instead of tools
psheth9 Feb 21, 2024
618c3bc
Merge branch 'main' into remove-soroban-tools-reference
psheth9 Feb 21, 2024
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
4 changes: 2 additions & 2 deletions cmd/soroban-rpc/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ FROM golang:1.21-bullseye as build
ARG RUST_TOOLCHAIN_VERSION=stable
ARG REPOSITORY_VERSION

WORKDIR /go/src/github.com/stellar/soroban-tools
WORKDIR /go/src/github.com/stellar/soroban-rpc

ADD . ./

RUN git config --global --add safe.directory "/go/src/github.com/stellar/soroban-tools"
RUN git config --global --add safe.directory "/go/src/github.com/stellar/soroban-rpc"

ENV CARGO_HOME=/rust/.cargo
ENV RUSTUP_HOME=/rust/.rust
Expand Down
2 changes: 1 addition & 1 deletion cmd/soroban-rpc/docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SUDO := $(shell docker version >/dev/null 2>&1 || echo "sudo")
BUILD_DATE := $(shell date -u +%FT%TZ)

# Extract latest release semver from GitHub
SOROBAN_RPC_LATEST_RELEASE := $(shell curl -sS https://api.github.com/repos/stellar/soroban-tools/releases/latest|jq -r ".tag_name"| tr -d "v" )
SOROBAN_RPC_LATEST_RELEASE := $(shell curl -sS https://api.github.com/repos/stellar/soroban-rpc/releases/latest|jq -r ".tag_name"| tr -d "v" )

# If deb version was provided via the SOROBAN_RPC_VERSION variable use it.
# If not get latest deb build matching release from GitHub
Expand Down
2 changes: 1 addition & 1 deletion cmd/soroban-rpc/internal/test/integration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ func findDockerComposePath() string {
//

if gopath := os.Getenv("GOPATH"); gopath != "" {
monorepo := filepath.Join(gopath, "src", "github.com", "stellar", "soroban-tools")
monorepo := filepath.Join(gopath, "src", "github.com", "stellar", "soroban-rpc")
if _, err = os.Stat(monorepo); !os.IsNotExist(err) {
current = monorepo
}
Expand Down
Loading