From c8e69aaa67b2d4f1a730f156dea6ac843bffd93f Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Fri, 10 Feb 2023 14:42:54 +0100
Subject: [PATCH] More clean up

---
 Dockerfile             | 13 ++++---------
 setup/config/config.go |  9 ---------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7a6883d62..857aabfe4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,23 +23,18 @@ RUN --mount=target=. \
     CGO_ENABLED=$([ "$TARGETARCH" = "$USERARCH" ] && echo "1" || echo "0") \
     go build -v -ldflags="${FLAGS}" -trimpath -o /out/ ./cmd/...
 
+
 #
-# The dendrite base image
+# Builds the Dendrite image containing all required binaries
 #
-FROM alpine:latest AS dendrite-base
-RUN apk --update --no-cache add curl
+FROM alpine:latest
+LABEL org.opencontainers.image.title="Dendrite"
 LABEL org.opencontainers.image.description="Next-generation Matrix homeserver written in Go"
 LABEL org.opencontainers.image.source="https://github.com/matrix-org/dendrite"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.documentation="https://matrix-org.github.io/dendrite/"
 LABEL org.opencontainers.image.vendor="The Matrix.org Foundation C.I.C."
 
-#
-# Builds the monolith image and contains all required binaries
-#
-FROM dendrite-base AS monolith
-LABEL org.opencontainers.image.title="Dendrite (Monolith)"
-
 COPY --from=build /out/create-account /usr/bin/create-account
 COPY --from=build /out/generate-config /usr/bin/generate-config
 COPY --from=build /out/generate-keys /usr/bin/generate-keys
diff --git a/setup/config/config.go b/setup/config/config.go
index ed55a387a..848766162 100644
--- a/setup/config/config.go
+++ b/setup/config/config.go
@@ -112,15 +112,6 @@ type Derived struct {
 	// servers from creating RoomIDs in exclusive application service namespaces
 }
 
-type InternalAPIOptions struct {
-	Listen  HTTPAddress `yaml:"listen"`
-	Connect HTTPAddress `yaml:"connect"`
-}
-
-type ExternalAPIOptions struct {
-	Listen HTTPAddress `yaml:"listen"`
-}
-
 // A Path on the filesystem.
 type Path string