Skip to content

Commit ad043a1

Browse files
committed
Update deployment
1 parent 12e4e4f commit ad043a1

File tree

4 files changed

+19
-16
lines changed

4 files changed

+19
-16
lines changed

.github/workflows/push.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ jobs:
2727
source "$HOME/.sdkman/bin/sdkman-init.sh"
2828
sdk env install
2929
docker login --username "$DOCKER_HUB_USERNAME" --password "$DOCKER_HUB_PASSWORD"
30-
./gradlew jpackage
30+
3131
./gradlew push

build.gradle.kts

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import org.gradle.api.tasks.wrapper.Wrapper.DistributionType.ALL
22

33
plugins {
4-
kotlin("jvm") version("2.0.0")
4+
kotlin("jvm") version("2.0.10")
55
id("org.graalvm.buildtools.native") version("0.10.2")
66
}
77

8-
val hexagonVersion = "3.6.0"
8+
val hexagonVersion = "3.6.1"
99
val hexagonExtraVersion = "3.6.0"
1010
val logbackVersion = "1.5.6"
11-
val testcontainersVersion = "1.19.8"
11+
val testcontainersVersion = "1.20.1"
1212
val gradleScripts = "https://raw.githubusercontent.com/hexagontk/hexagon/$hexagonVersion/gradle"
1313

1414
ext.set("modules", "java.xml,java.naming")
@@ -17,6 +17,7 @@ ext.set("applicationClass", "com.hexagontk.todo.backend.MainKt")
1717

1818
apply(from = "$gradleScripts/kotlin.gradle")
1919
apply(from = "$gradleScripts/application.gradle")
20+
apply(from = "$gradleScripts/native.gradle")
2021

2122
dependencies {
2223
implementation("com.hexagonkt:http_server_jetty:$hexagonVersion")
@@ -35,7 +36,7 @@ dependencies {
3536
}
3637

3738
tasks.wrapper {
38-
gradleVersion = "8.8"
39+
gradleVersion = "8.9"
3940
distributionType = ALL
4041
}
4142

@@ -52,8 +53,8 @@ tasks.register("push", type = Exec::class) {
5253
}
5354

5455
tasks.register("up", type = Exec::class) {
55-
dependsOn("push")
56-
commandLine("docker", "compose", "--profile", "local", "up", "-d")
56+
dependsOn("buildImage")
57+
commandLine("docker", "compose", "--profile", "local", "up")
5758
dockerEnvironment()
5859
}
5960

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/main/kotlin/Application.kt

+10-8
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,16 @@ import com.hexagontk.todo.backend.adapters.MongoDbTaskStore
1010
import com.hexagontk.todo.backend.rest.Router
1111

1212
internal class Application {
13-
private val server: HttpServer = HttpServer(
14-
adapter = JettyServletAdapter(minThreads = 4),
15-
handler = Router(store = MongoDbTaskStore()).handler,
16-
settings = HttpServerSettings(
17-
bindPort = 2010,
18-
bindAddress = Jvm.systemSetting("BIND_ADDRESS", LOOPBACK_INTERFACE)
19-
),
20-
)
13+
private val server: HttpServer by lazy {
14+
HttpServer(
15+
adapter = JettyServletAdapter(minThreads = 4),
16+
handler = Router(store = MongoDbTaskStore()).handler,
17+
settings = HttpServerSettings(
18+
bindPort = 2010,
19+
bindAddress = Jvm.systemSetting("BIND_ADDRESS", LOOPBACK_INTERFACE)
20+
),
21+
)
22+
}
2123

2224
fun start() {
2325
SerializationManager.formats = setOf(Json)

0 commit comments

Comments
 (0)