Skip to content

Make Caddy container ports configurable via environment variables #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaredlander merged 2 commits into from
Dec 4, 2025
Merged

Make Caddy container ports configurable via environment variables #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8277442
Initial plan
Copilot Dec 4, 2025
a2d66a1
Add configurable HTTP and HTTPS ports for Caddy container via environ…
Copilot Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/kotlin/eu/openanalytics/shinyproxyoperator/impl/docker/CaddyConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ class CaddyConfig(private val dockerClient: DockerClient, mainDataDir: Path, con
private val fileManager = FileManager()
private val caddyImage: String = config.readConfigValue("docker.io/library/caddy:2.8", "SPO_CADDY_IMAGE") { it }
private val enableTls = config.readConfigValue(false, "SPO_CADDY_ENABLE_TLS") { it.toBoolean() }
private val caddyPortHttp: Int = config.readConfigValue(80, "SPO_CADDY_PORT_HTTP") { it.toInt() }
private val caddyPortHttps: Int = config.readConfigValue(443, "SPO_CADDY_PORT_HTTPS") { it.toInt() }
private val client: OkHttpClient = OkHttpClient.Builder()
.connectTimeout(3, TimeUnit.SECONDS)
.readTimeout(3, TimeUnit.SECONDS)
Expand Down Expand Up @@ -101,7 +103,7 @@ class CaddyConfig(private val dockerClient: DockerClient, mainDataDir: Path, con
}

private fun generateServer(): Map<String, Any> {
val listen = if (enableTls) listOf(":443") else listOf(":80")
val listen = if (enableTls) listOf(":$caddyPortHttps") else listOf(":$caddyPortHttp")
return mapOf("listen" to listen, "routes" to generateRoutes(), "tls_connection_policies" to generateTlsConnectionPolicies())
}

Expand Down Expand Up @@ -277,7 +279,7 @@ class CaddyConfig(private val dockerClient: DockerClient, mainDataDir: Path, con
logger.info { "[Caddy] Pulling image" }
dockerActions.pullImage(caddyImage)

val ports = if (enableTls) listOf("80", "443") else listOf("80")
val ports = if (enableTls) listOf("$caddyPortHttp", "$caddyPortHttps") else listOf("$caddyPortHttp")
val hostConfig = HostConfig.builder()
.networkMode(DockerOrchestrator.SHARED_NETWORK_NAME)
.binds(HostConfig.Bind.builder()
Expand Down