Skip to content

Add Docker init and runtime support for engine#133

Merged
ziagham merged 6 commits intoflowsynx:masterfrom
Sakeeb91:feature/docker-engine
Nov 27, 2025
Merged

Add Docker init and runtime support for engine#133
ziagham merged 6 commits intoflowsynx:masterfrom
Sakeeb91:feature/docker-engine

Conversation

@Sakeeb91
Copy link
Copy Markdown
Contributor

What type of PR is this? (check all applicable)

  • Feature
  • Refactor
  • Bug Fix
  • Optimization
  • Documentation Update

Description

  • add Docker-based init/run/stop/uninstall paths for the FlowSynx engine with new flags (container name, port 6262, mount paths, container data path) and friendly Docker availability checks
  • store install mode and Docker metadata in appsettings.json beside flowctl, defaulting to binding ~/.flowsynx/data to /app/data for persistence
  • introduce Docker CLI abstraction and config service, plus unit tests for settings persistence and docker-mode run guidance; update README with Docker usage steps

Issue reference

Closes #110

Checklist

@Sakeeb91
Copy link
Copy Markdown
Contributor Author

Merge Conflict Note – PR #133 (feature/docker-engine vs master)

There is a single conflict when bringing origin/master into feature/docker-engine:

  • File: src/FlowCtl/Commands/Run/RunCommandOptionsHandler.cs
  • Cause: feature/docker-engine adds the Docker run path and settings persistence; master added XML docs/cleanup around GetArgumentStr (and nearby helpers). Git could not auto-merge those overlapping edits.

How to resolve

  1. Keep the Docker logic from feature/docker-engine:
    • The RunDockerAsync method with Docker pull/run/start and settings persistence.
    • The platform/tag resolution helpers and the Docker mode hinting.
  2. Keep the upstream doc/comment/formatting improvements from master:
    • The XML documentation and tightened argument construction around GetArgumentStr (and related small cleanups).
  3. Resulting file should have:
    • The full Docker pathway (pull/create/start, attach logs when not background).
    • The GetArgumentStr with upstream doc comment.
    • No conflict markers.

Notes

  • Do the merge in a clean worktree to avoid touching unrelated local changes (e.g., ConsoleLogger removals, JsonSerializer tweaks).
  • After resolving, rerun dotnet test and push the updated branch before re-running the PR checks.

@ziagham
Copy link
Copy Markdown
Member

ziagham commented Nov 20, 2025

These are significant changes 👀
I’ll review them at my convenience

Copy link
Copy Markdown
Member

@ziagham ziagham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really great changes. Thanks :)

@ziagham ziagham merged commit 41093a6 into flowsynx:master Nov 27, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Set up and initialize the FlowSynx engine within a Dockerized environment

2 participants