From ae9d6f4721e1d3d82186043bb25e5e2e441fd38c Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Fri, 4 Oct 2024 18:35:30 +0200 Subject: [PATCH 1/2] Use docker build TAG if supplied --- cmd/soroban-rpc/docker/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/soroban-rpc/docker/Makefile b/cmd/soroban-rpc/docker/Makefile index 1d02a5cd..cab2fbbd 100644 --- a/cmd/soroban-rpc/docker/Makefile +++ b/cmd/soroban-rpc/docker/Makefile @@ -25,12 +25,14 @@ endif # Set default value for BINARY_NAME if not provided BINARY_NAME ?= soroban-rpc +ifndef TAG # Set the TAG based on the value of BINARY_NAME ifeq ($(BINARY_NAME),stellar-rpc) TAG := stellar/stellar-rpc:$(SOROBAN_RPC_VERSION_PACKAGE_VERSION) else TAG := stellar/stellar-soroban-rpc:$(SOROBAN_RPC_VERSION_PACKAGE_VERSION) endif +endif # TAG docker-build: From ed435e711332957c323953f87cf8baac79aa337e Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Fri, 4 Oct 2024 18:39:00 +0200 Subject: [PATCH 2/2] Address review feedback --- cmd/soroban-rpc/docker/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/soroban-rpc/docker/Makefile b/cmd/soroban-rpc/docker/Makefile index cab2fbbd..f9f6b4b0 100644 --- a/cmd/soroban-rpc/docker/Makefile +++ b/cmd/soroban-rpc/docker/Makefile @@ -26,12 +26,12 @@ endif BINARY_NAME ?= soroban-rpc ifndef TAG -# Set the TAG based on the value of BINARY_NAME -ifeq ($(BINARY_NAME),stellar-rpc) - TAG := stellar/stellar-rpc:$(SOROBAN_RPC_VERSION_PACKAGE_VERSION) -else - TAG := stellar/stellar-soroban-rpc:$(SOROBAN_RPC_VERSION_PACKAGE_VERSION) -endif + # Set the TAG based on the value of BINARY_NAME + ifeq ($(BINARY_NAME),stellar-rpc) + TAG := stellar/stellar-rpc:$(SOROBAN_RPC_VERSION_PACKAGE_VERSION) + else + TAG := stellar/stellar-soroban-rpc:$(SOROBAN_RPC_VERSION_PACKAGE_VERSION) + endif endif # TAG