From 1bd4e7a8c9f7aaad70ae5b608d9e0c6c9a432532 Mon Sep 17 00:00:00 2001
From: djkazic <kevincai96@gmail.com>
Date: Mon, 7 Oct 2024 12:19:53 +0200
Subject: [PATCH] Add bitcoin core v28.0

---
 28/alpine/Dockerfile | 15 +++++++++++++++
 README.md            |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/28/alpine/Dockerfile b/28/alpine/Dockerfile
index 489f1f8..5d3937f 100644
--- a/28/alpine/Dockerfile
+++ b/28/alpine/Dockerfile
@@ -47,6 +47,7 @@ RUN mkdir -p ${GNUPGHOME}
 RUN set -ex \
   && for key in \
   101598DC823C1B5F9A6624ABA5E0907A0380E6C3 \
+<<<<<<< HEAD
   F2CFC4ABD0B99D837EEBB7D09B79B45691DB4173 \
   152812300785C96444D3334D17565732E08E5E41 \
   0AD83877C1F0CD1EE9BD660AD7CC770B81FD22A8 \
@@ -65,6 +66,20 @@ RUN set -ex \
   637DB1E23370F84AFF88CCE03152347D07DA627C \
   E86AE73439625BBEE306AAE6B66D427F873CB1A3 \
   E61773CD6E01040E2F1BD78CE7E2984B6289C93A \
+=======
+  6A8F9C266528E25AEB1D7731C2371D91CB716EA7 \
+  2840EAABF4BC9F0FFD716AFAFBAFCC46DE2D3FE2 \
+  E86AE73439625BBEE306AAE6B66D427F873CB1A3 \
+  A0083660F235A27000CD3C81CE6EC49945C17EA6 \
+  F19F5FF2B0589EC341220045BA03F4DBE0C63FB4 \
+  637DB1E23370F84AFF88CCE03152347D07DA627C \
+  ED9BDF7AD6A55E232E84524257FF9BDBCC301009 \
+  CFB16E21C950F67FA95E558F2EEB9F5CC09526C1 \
+  152812300785C96444D3334D17565732E08E5E41 \
+  C388F6961FB972A95678E327F62711DBDCA8AE56 \
+  9DEAE0DC7063249FB05474681E4AED62986CD25D \
+  D1DBF2C4B96F2DEBF4C16654410108112E7EA81F \
+>>>>>>> bcd1336 (Add bitcoin core v28.0)
   ; do \
   gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" || \
   gpg --batch --keyserver keys.openpgp.org --recv-keys "$key" || \
diff --git a/README.md b/README.md
index f5430f3..72fe39b 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,8 @@ A bitcoin-core docker image with support for the following platforms:
 [![lightninglabs/bitcoin-core][docker-pulls-image]][docker-hub-url] [![lightninglabs/bitcoin-core][docker-stars-image]][docker-hub-url] [![lightninglabs/bitcoin-core][docker-size-image]][docker-hub-url]
 
 ## Tags
+- `28.0`, `28` ([28/Dockerfile](https://github.com/lightninglabs/docker-bitcoin-core/blob/master/28/Dockerfile)) [**multi-arch**]
+- `28.0-alpine`, `28-alpine` ([27/alpine/Dockerfile](https://github.com/lightninglabs/docker-bitcoin-core/blob/master/28/alpine/Dockerfile))
 
 - `27.0`, `27` ([27/Dockerfile](https://github.com/lightninglabs/docker-bitcoin-core/blob/master/27/Dockerfile)) [**multi-arch**]
 - `27.0-alpine`, `27-alpine` ([27/alpine/Dockerfile](https://github.com/lightninglabs/docker-bitcoin-core/blob/master/27/alpine/Dockerfile))