upgrade(docker)
This commit is contained in:
@@ -102,7 +102,6 @@ temp-data/
|
|||||||
# ===================================================================
|
# ===================================================================
|
||||||
# Kotlin Multiplatform specific
|
# Kotlin Multiplatform specific
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
**/kotlin-js-store/
|
|
||||||
**/build/js/
|
**/build/js/
|
||||||
**/build/compileSync/
|
**/build/compileSync/
|
||||||
**/build/klib/
|
**/build/klib/
|
||||||
@@ -119,7 +118,6 @@ temp-data/
|
|||||||
# ===================================================================
|
# ===================================================================
|
||||||
**/prometheus-data/
|
**/prometheus-data/
|
||||||
**/grafana-data/
|
**/grafana-data/
|
||||||
**/logs/
|
|
||||||
**/*.log.*
|
**/*.log.*
|
||||||
**/log/
|
**/log/
|
||||||
|
|
||||||
@@ -138,21 +136,15 @@ temp-data/
|
|||||||
# ===================================================================
|
# ===================================================================
|
||||||
# OS specific files
|
# OS specific files
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
.DS_Store
|
|
||||||
.DS_Store?
|
.DS_Store?
|
||||||
._*
|
._*
|
||||||
.Spotlight-V100
|
.Spotlight-V100
|
||||||
.Trashes
|
.Trashes
|
||||||
ehthumbs.db
|
ehthumbs.db
|
||||||
Thumbs.db
|
|
||||||
|
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
# JetBrains IDE
|
# JetBrains IDE
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
.idea/
|
|
||||||
*.iws
|
|
||||||
*.iml
|
|
||||||
*.ipr
|
|
||||||
out/
|
out/
|
||||||
.idea_modules/
|
.idea_modules/
|
||||||
|
|
||||||
@@ -203,14 +195,12 @@ secrets/
|
|||||||
# ===================================================================
|
# ===================================================================
|
||||||
TODO*.md
|
TODO*.md
|
||||||
NOTES*.md
|
NOTES*.md
|
||||||
**/temp/
|
|
||||||
**/.junie/
|
**/.junie/
|
||||||
|
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
# Keep essential files (override exclusions)
|
# Keep essential files (override exclusions)
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
# Gradle wrapper
|
# Gradle wrapper
|
||||||
!gradle/wrapper/gradle-wrapper.jar
|
|
||||||
!gradle/wrapper/gradle-wrapper.properties
|
!gradle/wrapper/gradle-wrapper.properties
|
||||||
|
|
||||||
# Essential configuration files for builds
|
# Essential configuration files for builds
|
||||||
|
|||||||
-2
@@ -1,7 +1,5 @@
|
|||||||
package at.mocode.client.data.service
|
package at.mocode.client.data.service
|
||||||
|
|
||||||
import kotlinx.serialization.encodeToString
|
|
||||||
import kotlinx.serialization.decodeFromString
|
|
||||||
import kotlinx.serialization.json.Json
|
import kotlinx.serialization.json.Json
|
||||||
import kotlin.test.Test
|
import kotlin.test.Test
|
||||||
import kotlin.test.assertEquals
|
import kotlin.test.assertEquals
|
||||||
|
|||||||
+1
-1
@@ -134,7 +134,7 @@ class PingServiceTest {
|
|||||||
@Test
|
@Test
|
||||||
fun `should properly encapsulate HttpClient lifecycle`() {
|
fun `should properly encapsulate HttpClient lifecycle`() {
|
||||||
// Given
|
// Given
|
||||||
var client: HttpClient? = null
|
val client: HttpClient? = null
|
||||||
|
|
||||||
// When
|
// When
|
||||||
val service = PingService()
|
val service = PingService()
|
||||||
|
|||||||
+3
-2
@@ -2,8 +2,9 @@ package at.mocode.client.ui.viewmodel
|
|||||||
|
|
||||||
import at.mocode.client.data.service.PingResponse
|
import at.mocode.client.data.service.PingResponse
|
||||||
import at.mocode.client.data.service.PingService
|
import at.mocode.client.data.service.PingService
|
||||||
import kotlinx.coroutines.*
|
import kotlinx.coroutines.CoroutineScope
|
||||||
import kotlinx.coroutines.test.*
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.cancel
|
||||||
import kotlin.test.*
|
import kotlin.test.*
|
||||||
|
|
||||||
@OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class)
|
@OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class)
|
||||||
|
|||||||
@@ -50,10 +50,6 @@ kotlin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
compose.experimental {
|
|
||||||
web.application {}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Web-specific optimizations
|
// Web-specific optimizations
|
||||||
tasks.named("jsBrowserDevelopmentWebpack") {
|
tasks.named("jsBrowserDevelopmentWebpack") {
|
||||||
outputs.upToDateWhen { false }
|
outputs.upToDateWhen { false }
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package at.mocode.client.web
|
|||||||
import kotlin.test.Test
|
import kotlin.test.Test
|
||||||
import kotlin.test.assertNotNull
|
import kotlin.test.assertNotNull
|
||||||
import kotlin.test.assertTrue
|
import kotlin.test.assertTrue
|
||||||
import kotlin.test.assertEquals
|
|
||||||
|
|
||||||
class MainTest {
|
class MainTest {
|
||||||
|
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ scrape_configs:
|
|||||||
# Only scrape services that have prometheus.scrape=true
|
# Only scrape services that have prometheus.scrape=true
|
||||||
- source_labels: [__meta_consul_service_metadata_prometheus_scrape]
|
- source_labels: [__meta_consul_service_metadata_prometheus_scrape]
|
||||||
action: keep
|
action: keep
|
||||||
regex: true
|
regex: "true"
|
||||||
|
|
||||||
# Use service name as job name
|
# Use service name as job name
|
||||||
- source_labels: [__meta_consul_service]
|
- source_labels: [__meta_consul_service]
|
||||||
@@ -123,12 +123,12 @@ scrape_configs:
|
|||||||
# Use custom metrics path if specified
|
# Use custom metrics path if specified
|
||||||
- source_labels: [__meta_consul_service_metadata_prometheus_path]
|
- source_labels: [__meta_consul_service_metadata_prometheus_path]
|
||||||
target_label: __metrics_path__
|
target_label: __metrics_path__
|
||||||
regex: (.+)
|
regex: "(.+)"
|
||||||
|
|
||||||
# Use custom port if specified
|
# Use custom port if specified
|
||||||
- source_labels: [__address__, __meta_consul_service_metadata_prometheus_port]
|
- source_labels: [__address__, __meta_consul_service_metadata_prometheus_port]
|
||||||
target_label: __address__
|
target_label: __address__
|
||||||
regex: ([^:]+)(?::\d+)?;(\d+)
|
regex: "([^:]+)(?::\d+)?;(\d+)"
|
||||||
replacement: $1:$2
|
replacement: $1:$2
|
||||||
|
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
|
|||||||
Reference in New Issue
Block a user