search

lisaac / luci-app-dockerman

Docker Manager interface for LuCI
GNU Affero General Public License v3.0
836 stars 233 forks source link

question: lead together luci-app-dockerman from the luci upstream #93

Closed feckert closed 3 years ago

feckert commented 3 years ago

@lisaac As you know I have integrated luci-app-dockerman into the luci upstream repository. In the next stable release of openwrt (openwrt-21.02) the application would already be included. Through the integration we have a greater reach that users will try out this application. Would it not make sense to have only one code base?

lisaac commented 3 years ago

@feckert Sure, but as you know the code base line was out of sync, it's may takes time to merge it, also there are some commits in luci upstream repository need to rollback.

If so, I will open PR recently.

feckert commented 3 years ago

@lisaac that would be create if we could merge the code base again. For the record: I have moved the whole uci handling from the dockerman uci file into dockerd uci file. So in the LuCI we only write the uci into the dockerd uci file. So I have removed the dockerman uci file.

lisaac commented 3 years ago

@feckert With @hue715's helps, on #97 we've merge the luci update. We've removed the dockerman uci file as you wish, and also revert some commits, so there are still some conflicts with luci repository.

The question is how we open a PR to commit updates to luci repository? cherry pick or combine into one commit?