Skip to content

armgit / Ix

Public Imported from GitHub
0

Understand any codebase instantly. System intelligence for codebases, built for humans and AI.

Merge main into feature/ix-redesign — resolve infra file conflicts

riley022795b3b88cafe1
diff --cc build.sbt
index 04b37ba4,6fdc24c3..66410b9a
--- a/build.sbt
+++ b/build.sbt
@@@ -48,13 -45,16 +48,13 @@@ lazy val memoryLayer = (project in file
assembly / mainClass := Some("ix.memory.Main"),
assembly / assemblyJarName := "ix-memory-layer.jar",
assembly / assemblyMergeStrategy := {
-- case PathList("META-INF", "services", _*) => MergeStrategy.concat
- case PathList("META-INF", "versions", _*) => MergeStrategy.first
-- case PathList("META-INF", "vertx", _*) => MergeStrategy.first
- case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
- case PathList("META-INF", "NOTICE", _*) => MergeStrategy.discard
- case PathList("META-INF", "LICENSE", _*) => MergeStrategy.discard
- case PathList("META-INF", "NOTICE.txt") => MergeStrategy.discard
- case PathList("META-INF", "LICENSE.txt") => MergeStrategy.discard
- case PathList("META-INF", "NOTICE.md") => MergeStrategy.discard
- case PathList("META-INF", "LICENSE.md") => MergeStrategy.discard
- case PathList("META-INF", _*) => MergeStrategy.first
- case _ => MergeStrategy.first
++ case PathList("META-INF", "services", _*) => MergeStrategy.concat
++ case PathList("META-INF", "versions", _*) => MergeStrategy.first
++ case PathList("META-INF", "vertx", _*) => MergeStrategy.first
+ case PathList("META-INF", "native-image", _*) => MergeStrategy.first
- case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
- case PathList("META-INF", _*) => MergeStrategy.discard
- case "module-info.class" => MergeStrategy.discard
- case _ => MergeStrategy.first
++ case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
++ case PathList("META-INF", _*) => MergeStrategy.discard
++ case "module-info.class" => MergeStrategy.discard
++ case _ => MergeStrategy.first
}
)
diff --cc stack.sh
index 71b5d1d8,53f1cd9a..09c1b3ce
--- a/stack.sh
+++ b/stack.sh
@@@ -12,24 -60,24 +60,29 @@@ case "${1:-up}" i
logs)
docker compose logs -f
;;
+ clean)
+ docker compose down -v
+ echo "Ix backend stopped and data volumes removed."
+ ;;
- up|*)
- echo "Building Memory Layer..."
- sbt "memoryLayer/assembly" 2>&1 | tail -5
- echo "Starting Ix backend..."
+ rebuild)
+ check_docker
+ build_jar true
+ echo "Rebuilding and starting Ix backend..."
docker compose up -d --build
- echo "Waiting for health checks..."
- for i in $(seq 1 30); do
- if curl -sf http://localhost:8090/v1/health > /dev/null 2>&1; then
- echo "Ix Memory backend is ready at http://localhost:8090"
- exit 0
- fi
- sleep 2
- done
- echo "Warning: Backend health check timed out. Check 'docker compose logs' for details."
+ wait_for_health
+ ;;
+ status)
+ docker compose ps
+ ;;
+ *)
- echo "Usage: ./stack.sh [up|down|logs|rebuild|status]"
++ echo "Usage: ./stack.sh [up|down|logs|clean|rebuild|status]"
+ echo ""
+ echo " up Build JAR (if needed) and start all services (default)"
+ echo " down Stop all services"
+ echo " logs Tail service logs"
++ echo " clean Stop all services and remove data volumes"
+ echo " rebuild Force rebuild JAR and restart services"
+ echo " status Show service status"
exit 1
;;
esac