Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ba63f605a7 | ||
|
|
a7b1839382 | ||
|
|
51661639b7 | ||
|
|
4c96c35255 | ||
|
|
130cc0566c | ||
|
|
5208a1311a |
@ -37,7 +37,7 @@ dependencies {
|
|||||||
implementation("com.iqser.red.commons:storage-commons:${storageCommonsVersion}")
|
implementation("com.iqser.red.commons:storage-commons:${storageCommonsVersion}")
|
||||||
implementation("com.iqser.red.commons:spring-commons:${springCommonsVersion}")
|
implementation("com.iqser.red.commons:spring-commons:${springCommonsVersion}")
|
||||||
implementation("com.iqser.red.commons:metric-commons:${metricCommonsVersion}")
|
implementation("com.iqser.red.commons:metric-commons:${metricCommonsVersion}")
|
||||||
implementation("com.knecon.fforesight:tracing-commons:0.5.0")
|
implementation("com.knecon.fforesight:tracing-commons:hotfix-tracing-commons-2")
|
||||||
|
|
||||||
implementation("org.apache.poi:poi:${poiVersion}")
|
implementation("org.apache.poi:poi:${poiVersion}")
|
||||||
implementation("org.apache.poi:poi-ooxml:${poiVersion}")
|
implementation("org.apache.poi:poi-ooxml:${poiVersion}")
|
||||||
@ -64,7 +64,8 @@ tasks.named<BootBuildImage>("bootBuildImage") {
|
|||||||
|
|
||||||
environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ")
|
environment.put("BPE_DELIM_JAVA_TOOL_OPTIONS", " ")
|
||||||
environment.put("BPE_APPEND_JAVA_TOOL_OPTIONS", "-Dfile.encoding=UTF-8")
|
environment.put("BPE_APPEND_JAVA_TOOL_OPTIONS", "-Dfile.encoding=UTF-8")
|
||||||
environment.put("BPE_FONTCONFIG_PATH", "/layers/fagiani_apt/apt/etc/fonts/")
|
environment.put("BPE_GS_LIB", "/layers/fagiani_apt/apt/usr/share/ghostscript/9.26/Resource/Init/") // set ghostscript lib path
|
||||||
|
environment.put("BPE_FONTCONFIG_PATH", "/layers/fagiani_apt/apt/etc/fonts/") // set ghostscript fontconfig path
|
||||||
|
|
||||||
val aptFile = layout.projectDirectory.file("src/main/resources/Aptfile").toString()
|
val aptFile = layout.projectDirectory.file("src/main/resources/Aptfile").toString()
|
||||||
bindings.add("${aptFile}:/workspace/Aptfile:ro")
|
bindings.add("${aptFile}:/workspace/Aptfile:ro")
|
||||||
@ -77,11 +78,9 @@ tasks.named<BootBuildImage>("bootBuildImage") {
|
|||||||
)
|
)
|
||||||
|
|
||||||
imageName.set("nexus.knecon.com:5001/red/${project.name}")
|
imageName.set("nexus.knecon.com:5001/red/${project.name}")
|
||||||
|
|
||||||
if (project.hasProperty("buildbootDockerHostNetwork")) {
|
if (project.hasProperty("buildbootDockerHostNetwork")) {
|
||||||
network.set("host")
|
network.set("host")
|
||||||
}
|
}
|
||||||
|
|
||||||
docker {
|
docker {
|
||||||
if (project.hasProperty("buildbootDockerHostNetwork")) {
|
if (project.hasProperty("buildbootDockerHostNetwork")) {
|
||||||
bindHostToBuilder.set(true)
|
bindHostToBuilder.set(true)
|
||||||
@ -94,7 +93,6 @@ tasks.named<BootBuildImage>("bootBuildImage") {
|
|||||||
email.set(providers.gradleProperty("mavenEmail").getOrNull())
|
email.set(providers.gradleProperty("mavenEmail").getOrNull())
|
||||||
url.set("https://nexus.knecon.com:5001/")
|
url.set("https://nexus.knecon.com:5001/")
|
||||||
}
|
}
|
||||||
|
|
||||||
val dockerTag = "nexus.knecon.com:5001/red/${project.name}:${project.version}"
|
val dockerTag = "nexus.knecon.com:5001/red/${project.name}:${project.version}"
|
||||||
tags.set(listOf(dockerTag))
|
tags.set(listOf(dockerTag))
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,6 +16,7 @@ import com.iqser.red.service.redaction.report.v1.server.configuration.MessagingC
|
|||||||
import com.iqser.red.service.redaction.report.v1.server.settings.ReportTemplateSettings;
|
import com.iqser.red.service.redaction.report.v1.server.settings.ReportTemplateSettings;
|
||||||
import com.iqser.red.storage.commons.StorageAutoConfiguration;
|
import com.iqser.red.storage.commons.StorageAutoConfiguration;
|
||||||
import com.knecon.fforesight.tenantcommons.MultiTenancyAutoConfiguration;
|
import com.knecon.fforesight.tenantcommons.MultiTenancyAutoConfiguration;
|
||||||
|
import com.knecon.fforesight.tracing.OpenTelemetryConfig;
|
||||||
|
|
||||||
import io.micrometer.core.aop.TimedAspect;
|
import io.micrometer.core.aop.TimedAspect;
|
||||||
import io.micrometer.core.instrument.MeterRegistry;
|
import io.micrometer.core.instrument.MeterRegistry;
|
||||||
@ -23,7 +24,7 @@ import io.micrometer.core.instrument.MeterRegistry;
|
|||||||
@EnableAsync
|
@EnableAsync
|
||||||
@ImportAutoConfiguration({MultiTenancyAutoConfiguration.class})
|
@ImportAutoConfiguration({MultiTenancyAutoConfiguration.class})
|
||||||
@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
|
@SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
|
||||||
@Import({MessagingConfiguration.class, StorageAutoConfiguration.class})
|
@Import({MessagingConfiguration.class, StorageAutoConfiguration.class, OpenTelemetryConfig.class})
|
||||||
@EnableFeignClients(basePackageClasses = {DossierClient.class})
|
@EnableFeignClients(basePackageClasses = {DossierClient.class})
|
||||||
@EnableConfigurationProperties(ReportTemplateSettings.class)
|
@EnableConfigurationProperties(ReportTemplateSettings.class)
|
||||||
public class Application {
|
public class Application {
|
||||||
|
|||||||
@ -1 +1,8 @@
|
|||||||
fontconfig
|
# Install Fontconfig
|
||||||
|
fontconfig
|
||||||
|
|
||||||
|
# Additional font packages
|
||||||
|
fonts-dejavu
|
||||||
|
fonts-liberation
|
||||||
|
gsfonts
|
||||||
|
ttf-mscorefonts-installer
|
||||||
@ -5,6 +5,12 @@ management:
|
|||||||
health.enabled: true
|
health.enabled: true
|
||||||
endpoints.web.exposure.include: prometheus, health, metrics
|
endpoints.web.exposure.include: prometheus, health, metrics
|
||||||
metrics.export.prometheus.enabled: true
|
metrics.export.prometheus.enabled: true
|
||||||
|
tracing:
|
||||||
|
enabled: ${TRACING_ENABLED:false}
|
||||||
|
otlp:
|
||||||
|
tracing:
|
||||||
|
endpoint: ${OTLP_ENDPOINT:http://otel-collector-opentelemetry-collector.otel-collector:4318/v1/traces}
|
||||||
|
|
||||||
|
|
||||||
spring:
|
spring:
|
||||||
main:
|
main:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user