Merge branch 'master' into lookuptable-query

stellar · Aug 22, 2024 · 4f18bf8 · 4f18bf8
2 parents 08ada2f + dfabe31
commit 4f18bf8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/ingest/README.md b/ingest/README.md
@@ -23,9 +23,9 @@ From a high level, the ingestion library is broken down into a few modular compo
 
                 [ Ledger Backend ]
                         |
-                        |
-                     Captive  
-                      Core 
+                    |---+---|
+                 Captive Buffered
+                  Core   Storage
 ```
 
 This is described in a little more detail in [`doc.go`](./doc.go), its accompanying examples, the documentation within this package, and the rest of this tutorial.

diff --git a/services/galexie/docker/Dockerfile b/services/galexie/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22-bullseye AS builder
+FROM golang:1.22-bookworm AS builder
 
 WORKDIR /go/src/github.com/stellar/go
 

diff --git a/services/horizon/CONTRIBUTING.md b/services/horizon/CONTRIBUTING.md
@@ -1,6 +1,3 @@
 # How to contribute
 
-Please read the [Contribution Guide](https://github.com/stellar/docs/blob/master/CONTRIBUTING.md).
-
-Then please [sign the Contributor License Agreement](https://docs.google.com/forms/d/1g7EF6PERciwn7zfmfke5Sir2n10yddGGSXyZsq98tVY/viewform?usp=send_form).
-
+Please read the [Contribution Guide](https://github.com/stellar/.github/blob/master/CONTRIBUTING.md).
diff --git a/services/horizon/docker/Dockerfile.dev b/services/horizon/docker/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM golang:1.22-bullseye AS builder
+FROM golang:1.22-bookworm AS builder
 
 ARG VERSION="devel"
 WORKDIR /go/src/github.com/stellar/go