Merge pull request #16199 from CDCgov/flexion/demo1/utf-8

Demo 1 - UTF-8 char Encoding Bug
CDCgov · Oct 11, 2024 · f4d8e71 · f4d8e71
2 parents ffbe8be + aa26108
commit f4d8e71
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -17,7 +17,7 @@ kotlin {
 }
 
 dependencies {
-    val kotlinVersion by System.getProperties()
+    val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.9.23"
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
     implementation("org.jlleitschuh.gradle.ktlint:org.jlleitschuh.gradle.ktlint.gradle.plugin:12.1.1")
 }
diff --git a/prime-router/Dockerfile.build b/prime-router/Dockerfile.build
@@ -17,7 +17,14 @@ FROM alpine:3.20 AS downloader
 ARG GRADLE_VERSION=8.10.2
 ARG AFCT_VERSION=4.0.5198
 
-RUN apk update && apk add wget --no-cache
+RUN apk update && apk add wget --no-cache && apt-get install -y locales
+
+#
+# Add UTF-8 encoding
+#
+RUN locale-gen "en_US.UTF-8"
+ENV LANG=en_US.UTF-8 \
+    LANGUAGE=en_US:en
 
 # Get Gradle into /var/downloads/gradle (whithout version sub-directory
 # this makes it so that the GRADLE_VERSION does not need to leak into the

diff --git a/prime-router/Dockerfile.dev b/prime-router/Dockerfile.dev
@@ -30,6 +30,14 @@ RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash
 # Tools that we like
 RUN apt-get --yes install nano fish vim
 
+#
+# Add UTF-8 encoding
+#
+RUN apt-get install -y locales
+RUN locale-gen "en_US.UTF-8"
+ENV LANG=en_US.UTF-8 \
+    LANGUAGE=en_US:en
+
 CMD ["/bin/bash"]
 
 

diff --git a/prime-router/build.gradle.kts b/prime-router/build.gradle.kts
@@ -33,7 +33,7 @@ import java.util.Properties
 apply(from = rootProject.file("buildSrc/shared.gradle.kts"))
 
 plugins {
-    val kotlinVersion by System.getProperties()
+    val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.9.23"
     id("reportstream.project-conventions")
     id("org.flywaydb.flyway") version "10.18.2"
     id("nu.studer.jooq") version "9.0"
@@ -74,7 +74,7 @@ val javaVersion = when (appJvmTarget) {
     else -> JavaVersion.VERSION_17
 }
 val ktorVersion = "2.3.12"
-val kotlinVersion by System.getProperties()
+val kotlinVersion = System.getProperty("kotlinVersion") ?: "1.9.23"
 val jacksonVersion = "2.18.0"
 jacoco.toolVersion = "0.8.12"