Merge pull request #346 from guardian/atom-workshop-logging

Switch to DevX logs
guardian · Nov 21, 2023 · b794de2 · b794de2
2 parents 50f4c92 + d550036
commit b794de2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 74 deletions.
diff --git a/build.sbt b/build.sbt
@@ -30,9 +30,7 @@ lazy val root = (project in file(".")).enablePlugins(PlayScala, RiffRaffArtifact
 
     riffRaffArtifactResources := Seq(
       (Debian / packageBin).value -> "atom-workshop/atom-workshop_1.0_all.deb",
-      baseDirectory.value / "riff-raff.yaml" -> "riff-raff.yaml",
-      baseDirectory.value / "fluentbit/td-agent-bit.conf" -> "atom-workshop/fluentbit/td-agent-bit.conf",
-      baseDirectory.value / "fluentbit/parsers.conf" -> "atom-workshop/fluentbit/parsers.conf"
+      baseDirectory.value / "riff-raff.yaml" -> "riff-raff.yaml"
     ),
 
     Universal / javaOptions ++= Seq(

diff --git a/fluentbit/parsers.conf b/fluentbit/parsers.conf
diff --git a/fluentbit/td-agent-bit.conf b/fluentbit/td-agent-bit.conf
diff --git a/riff-raff.yaml b/riff-raff.yaml
@@ -12,7 +12,7 @@ deployments:
     parameters:
       amiTags:
         BuiltBy: amigo
-        Recipe: editorial-tools-focal-java8-ARM
+        Recipe: editorial-tools-focal-java8-ARM-WITH-cdk-base
         AmigoStage: PROD
       amiEncrypted: true
       amiParameter: ImageId