Merge remote-tracking branch 'upstream/master' into i519

stellar · Dec 5, 2023 · 2ed7016 · 2ed7016
2 parents 279b658 + c57d064
commit 2ed7016
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -227,7 +227,19 @@ jobs:
     # save can.  Once buildx supports it we can update.
     # https://github.com/docker/buildx/issues/847
     - name: Build Quickstart Image
-      run: docker build --platform linux/${{ inputs.arch }} -f Dockerfile -t $IMAGE --label org.opencontainers.image.revision="${{ env.HEAD_SHA }}" . --build-arg STELLAR_CORE_IMAGE_REF=stellar-core:${{ inputs.arch }} --build-arg HORIZON_IMAGE_REF=stellar-horizon:${{ inputs.arch }} --build-arg FRIENDBOT_IMAGE_REF=stellar-friendbot:${{ inputs.arch }} --build-arg SOROBAN_RPC_IMAGE_REF=stellar-soroban-rpc:${{ inputs.arch }} --build-arg CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=${{ inputs.core_supports_enable_soroban_diagnostic_events }}
+      run: >
+        docker build
+        --platform linux/${{ inputs.arch }}
+        -f Dockerfile
+        -t $IMAGE
+        --label org.opencontainers.image.revision="${{ env.HEAD_SHA }}"
+        .
+        --build-arg REVISION="${{ env.HEAD_SHA }}"
+        --build-arg STELLAR_CORE_IMAGE_REF=stellar-core:${{ inputs.arch }}
+        --build-arg HORIZON_IMAGE_REF=stellar-horizon:${{ inputs.arch }}
+        --build-arg FRIENDBOT_IMAGE_REF=stellar-friendbot:${{ inputs.arch }}
+        --build-arg SOROBAN_RPC_IMAGE_REF=stellar-soroban-rpc:${{ inputs.arch }}
+        --build-arg CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=${{ inputs.core_supports_enable_soroban_diagnostic_events }}
     - name: Save Quickstart Image
       run: docker save $IMAGE -o /tmp/image
     - name: Upload Quickstart Image

diff --git a/Dockerfile b/Dockerfile
@@ -12,6 +12,9 @@ FROM $SOROBAN_RPC_IMAGE_REF AS soroban-rpc
 
 FROM ubuntu:22.04
 
+ARG REVISION
+ENV REVISION $REVISION
+
 EXPOSE 5432
 EXPOSE 8000
 EXPOSE 6060

diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
 __PHONY__: run logs build build-deps build-deps-core build-deps-horizon build-deps-friendbot build-deps-soroban-rpc
 
+REVISION=$(shell git -c core.abbrev=no describe --always --exclude='*' --long --dirty)
 TAG?=dev
 XDR_REPO?=https://github.com/stellar/rs-stellar-xdr.git
 XDR_REF?=main
@@ -12,7 +13,7 @@ HORIZON_REF?=$(shell ./scripts/soroban_repo_to_horizon_repo.sh $(SOROBAN_RPC_REF
 FRIENDBOT_REF?=$(HORIZON_REF)
 
 run:
-	docker run --rm --name stellar -p 8000:8000 stellar/quickstart:$(TAG) --standalone --enable-soroban-rpc
+	docker run --rm --name stellar -p 8000:8000 stellar/quickstart:$(TAG) --local --enable-soroban-rpc
 
 logs:
 	docker exec stellar /bin/sh -c 'tail -F /var/log/supervisor/*'
@@ -44,7 +45,14 @@ build-soroban-dev:
 
 build:
 	$(MAKE) -j 4 build-deps
-	docker build -t stellar/quickstart:$(TAG) -f Dockerfile . --build-arg STELLAR_XDR_IMAGE_REF=stellar-xdr:$(XDR_REF) --build-arg STELLAR_CORE_IMAGE_REF=stellar-core:$(CORE_REF) --build-arg HORIZON_IMAGE_REF=stellar-horizon:$(HORIZON_REF) --build-arg FRIENDBOT_IMAGE_REF=stellar-friendbot:$(FRIENDBOT_REF) --build-arg SOROBAN_RPC_IMAGE_REF=stellar-soroban-rpc:$(SOROBAN_RPC_REF) --build-arg CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=$(CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS)
+	docker build -t stellar/quickstart:$(TAG) -f Dockerfile . \
+	  --build-arg REVISION=$(REVISION) \
+	  --build-arg STELLAR_XDR_IMAGE_REF=stellar-xdr:$(XDR_REF) \
+	  --build-arg STELLAR_CORE_IMAGE_REF=stellar-core:$(CORE_REF) \
+	  --build-arg HORIZON_IMAGE_REF=stellar-horizon:$(HORIZON_REF) \
+	  --build-arg FRIENDBOT_IMAGE_REF=stellar-friendbot:$(FRIENDBOT_REF) \
+	  --build-arg SOROBAN_RPC_IMAGE_REF=stellar-soroban-rpc:$(SOROBAN_RPC_REF) \
+	  --build-arg CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=$(CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS)
 
 build-deps: build-deps-xdr build-deps-core build-deps-horizon build-deps-friendbot build-deps-soroban-rpc
 

diff --git a/start b/start
@@ -76,6 +76,7 @@ function start() {
   echo "Starting Stellar Quickstart"
 
   echo "versions:"
+  echo "  quickstart: $REVISION"
   echo "  stellar-core:"
   echo "$(stellar-core version 2>/dev/null | sed 's/^/    /')"
   echo "  horizon:"