search

ucphhpc / docker-migrid

Containerized MiG
GNU General Public License v2.0
3 stars 6 forks source link

New deployment and versioning Workflow #26

Closed benibr closed 1 year ago

benibr commented 1 year ago

This PR changes the repository as discussed in #18 which means it

This is a draft right now and must not be merged before AU has reviewed and agreed on this.

Closes #18

benibr commented 1 year ago

Additionally this PR introduces images tags for the generated Docker images.

An admin can then see which MiGrid version resides inside the Docker image.

benibr commented 1 year ago

@Bjarke42 can you comment on this? Is this a direction that we wanna go in future?

benibr commented 1 year ago

We use mig_git_rev to specify the version we are deploying. If this is to be removed, then a version release of migrid has to exist.

mig_git_rev should always be set in production of course to pin the migrid version used. But I guess you use your own .env file anyway. The option is removed only from the example .env files in this repo, so that a push to migrid-sync does not need a code change in docker-migrid.

Bjarke42 commented 1 year ago

Now i have reviewed this, and i think its ready for merge. Also i think we HAVE TO start having a changelog and release versioning on this project as well as mostly have on ansible-docker-migrid. Ofcause its wise to wait till more improvements has been put on this docker-migrid project.

benibr commented 1 year ago

rebased and removed the accidentally added state folder.

ready to be merged

benibr commented 1 year ago

Looks fine to me ... it will likely leave some fall-out to clean up but we can live with that if you can. I have migrated our site specific files to ucphhpc/docker-migrid-ucphhpc and removed them here. I'm not sure how to proceed with the remaining three env conflicts, though.

What are those preparation commits for? They seem to change the same stuff as the commits in this PR, making rebasing now insanely complicated. Changes regarding this PR should never be necessary in master...

I'll try to figure out the last differences in the .env files now

jonasbardino commented 1 year ago

Looks fine to me ... it will likely leave some fall-out to clean up but we can live with that if you can. I have migrated our site specific files to ucphhpc/docker-migrid-ucphhpc and removed them here. I'm not sure how to proceed with the remaining three env conflicts, though.

What are those preparation commits for? They seem to change the same stuff as the commits in this PR, making rebasing now insanely complicated. Changes regarding this PR should never be necessary in master...

I'll try to figure out the last differences in the .env files now

Removing our advanced_X envs solved the conflicts there and I tried in vain to resolve the last three with manual merges. Admittedly, my git-foo is not great :-(

jonasbardino commented 1 year ago

Looks fine to me ... it will likely leave some fall-out to clean up but we can live with that if you can. I have migrated our site specific files to ucphhpc/docker-migrid-ucphhpc and removed them here. I'm not sure how to proceed with the remaining three env conflicts, though.

What are those preparation commits for? They seem to change the same stuff as the commits in this PR, making rebasing now insanely complicated. Changes regarding this PR should never be necessary in master... I'll try to figure out the last differences in the .env files now

Removing our advanced_X envs solved the conflicts there and I tried in vain to resolve the last three with manual merges. Admittedly, my git-foo is not great :-(

Let me know if it would make things easier if e.g. I reset to the last proper change with git reset --hard 2a47d0d7067d0e6d205ebd3ffca5785a7f70725a ; git push -f

benibr commented 1 year ago

Looks fine to me ... it will likely leave some fall-out to clean up but we can live with that if you can. I have migrated our site specific files to ucphhpc/docker-migrid-ucphhpc and removed them here. I'm not sure how to proceed with the remaining three env conflicts, though.

What are those preparation commits for? They seem to change the same stuff as the commits in this PR, making rebasing now insanely complicated. Changes regarding this PR should never be necessary in master... I'll try to figure out the last differences in the .env files now

Removing our advanced_X envs solved the conflicts there and I tried in vain to resolve the last three with manual merges. Admittedly, my git-foo is not great :-(

Let me know if it would make things easier if e.g. I reset to the last proper change with git reset --hard 2a47d0d7067d0e6d205ebd3ffca5785a7f70725a ; git push -f

Yeah, Without those changes the confilct are rather easy to resolve. Also the commits in this PR describe better what changed so I'd prefer to keep them.

Please reset as you suggested but on commit 9d7a580 which is the last no PR 26 related

jonasbardino commented 1 year ago

Looks fine to me ... it will likely leave some fall-out to clean up but we can live with that if you can. I have migrated our site specific files to ucphhpc/docker-migrid-ucphhpc and removed them here. I'm not sure how to proceed with the remaining three env conflicts, though.

What are those preparation commits for? They seem to change the same stuff as the commits in this PR, making rebasing now insanely complicated. Changes regarding this PR should never be necessary in master... I'll try to figure out the last differences in the .env files now

Removing our advanced_X envs solved the conflicts there and I tried in vain to resolve the last three with manual merges. Admittedly, my git-foo is not great :-(

Let me know if it would make things easier if e.g. I reset to the last proper change with git reset --hard 2a47d0d7067d0e6d205ebd3ffca5785a7f70725a ; git push -f

Yeah, Without those changes the confilct are rather easy to resolve. Also the commits in this PR describe better what changed so I'd prefer to keep them.

Please reset as you suggested but on commit 9d7a580 which is the last no PR 26 related

Done.

benibr commented 1 year ago

Thanks for all the support!

jonasbardino commented 1 year ago

okay, now it merged without further issues. Let's see how it goes when we start to rebuild :)

jonasbardino commented 1 year ago

No problem - thanks for all the work :+1: