MG-67 - Update Magistrala compose with SuperMQ compose#76
Conversation
d1b34d7 to
a234bd5
Compare
a234bd5 to
9b18f55
Compare
|
@felixgateru Please resolve conflicts. |
3c6c319 to
5cd6a9e
Compare
There was a problem hiding this comment.
Please include only the Docker folder and the .env file as a subtree.
Additionally, provide documentation on how to add or update the subtree. For example, if the SuperMQ Docker folder is updated, outline the steps to synchronize those changes with the master branch
We can make the subtree stick to specific tag or version of SMQ If we need to change version to new version of SMQ, then we can send a PR with git subtree updating to newer version |
b5d28ca to
ce5bb2d
Compare
arvindh123
left a comment
There was a problem hiding this comment.
Please remove docker/nginx/snippets , docker/ssl/authorization.js and docker/ssl/dhparam.pem from magistrala
arvindh123
left a comment
There was a problem hiding this comment.
Do we need
SMQ_CERTS_
SMQ_VAULT_
SMQ_JOURNAL_
In magistrala ?
We need I will remove the |
dborovcanin
left a comment
There was a problem hiding this comment.
This is rather dangerous, let's not mess up with someone else's repository. Instead, let's do something like this (I may have missed some steps):
- Shallow clone and use --sparse to download only Docker directory:
git clone --depth 1 --filter=blob:none --sparse https://github.com/absmach/supermq.git
cd supermq
git sparse-checkout set dockerThen, move this docker directory inside MG docker:
mv docker ../docker/supermq-docker
cd ..
rm -r supermqAlso, update Makefile to include SMQ overrides there.
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
…files Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
…into ./docker/supermq-docker Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
5a36bc3 to
a5620b4
Compare
| fetch_supermq: | ||
| @./scripts/supermq.sh | ||
|
|
There was a problem hiding this comment.
Add this to CI, so it performs chek if there are changes in the SMQ compose is up to date.
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Signed-off-by: Felix Gateru <felix.gateru@gmail.com>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #76 +/- ##
==========================================
- Coverage 33.52% 33.35% -0.17%
==========================================
Files 89 91 +2
Lines 13184 12527 -657
==========================================
- Hits 4420 4179 -241
+ Misses 8236 7927 -309
+ Partials 528 421 -107 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
What type of PR is this?
This is a refactor as it changes the Magistrala compose use the SuperMQ compose.
What does this do?
This pr:
SuperMQpackage inMagistralaWhich issue(s) does this PR fix/relate to?
Have you included tests for your changes?
No, this is manually tested.
Did you document any new/modified feature?
No
Notes