From 0038aaf1b2ca3dd99c166b428b811fc0b76c39b3 Mon Sep 17 00:00:00 2001
From: Jesper Jensen <jesper@jnsn.dev>
Date: Fri, 18 Jul 2025 15:30:03 +0200
Subject: Upgrade alpine

---
 Dockerfile   | 6 +++---
 Makefile     | 5 +++--
 src/base64.h | 1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9b25510..9ead15b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM docker.io/alpine:3.21 AS build
+FROM registry.hub.docker.com/library/alpine:3.22 AS build
 
-RUN apk add --no-cache make gcc musl-dev cmake libmicrohttpd-dev ruby
+RUN apk add --no-cache curl-dev libcurl make gcc musl-dev cmake libmicrohttpd-dev ruby
 
 COPY . /app
 WORKDIR /app
@@ -12,7 +12,7 @@ RUN cd thirdparty/prometheus-client-c && \
 
 RUN make test dht
 
-FROM docker.io/alpine:3.21
+FROM registry.hub.docker.com/library/alpine:3.22
 RUN apk add --no-cache libmicrohttpd
 COPY --from=build /usr/local/lib/libprom.so /usr/lib/libprom.so
 
diff --git a/Makefile b/Makefile
index 3e3d498..387da4b 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,8 @@ TEST_LIB_SOURCES = thirdparty/Unity/src/unity.c
 TEST_LIB_OBJS = $(TEST_LIB_SOURCES:%.c=$(OBJDIR)/%.o)
 TEST_LIB_DEPS = $(TEST_LIB_SOURCES:%.c=%.d)
 TEST_LIB_INCS = -Ithirdparty/Unity/src/
-TEST_LIB_CFLAGS = -DUNITY_INCLUDE_DOUBLE -lcurl
+TEST_LIB_CFLAGS = -DUNITY_INCLUDE_DOUBLE
+TEST_LIB_LIBS = -lcurl
 
 TEST_SOURCES = $(shell find $(TSTDIR) -name "*.c")
 TEST_EXES = $(TEST_SOURCES:%.c=$(OBJDIR)/%)
@@ -62,7 +63,7 @@ test: $(TEST_EXES)
 	$(foreach test,$(TEST_EXES),./$(test) &&) true
 
 $(OBJDIR)/test/%: $(APP_OBJS) $(TEST_LIB_OBJS) $(OBJDIR)/test/%.o $(OBJDIR)/test/%.runner.o
-	$(CC) $(LDFLAGS) $(TEST_LIB_CFLAGS) $(CFLAGS) -o $@ $^ $(LIBS)
+	$(CC) $(LDFLAGS) $(TEST_LIB_CFLAGS) $(CFLAGS) -o $@ $^ $(LIBS) $(TEST_LIB_LIBS)
 
 $(OBJDIR)/test/%.runner.c: test/%.c
 	@mkdir -p $(dir $@)
diff --git a/src/base64.h b/src/base64.h
index 6e52b87..ff021ec 100644
--- a/src/base64.h
+++ b/src/base64.h
@@ -4,6 +4,7 @@
 #include <stdint.h>
 #include <assert.h>
 #include <string.h>
+#include <sys/types.h>
 
 ssize_t base64_encode_inplace(const uint8_t *data, size_t data_len, char* buf, size_t buf_len);
 char *base64_encode(const unsigned char *data, size_t input_length, size_t *output_length);
-- 
cgit v1.2.3