Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make docker defaults more useful for local testing setup and update documentation #5087

Closed
wants to merge 4 commits into from

Conversation

SlowMo24
Copy link

@SlowMo24 SlowMo24 commented Apr 9, 2022

This PR updates the docker documentation that seems to lag behind the docker setup development. It does so by adapting the docker-compose defaults as well as the settings (.env) defaults.

In addition it updates and extends the documentation. This documentation update is quite brisk, so feel free to adapt anything where you don't agree. Especially I was not sure what would be the 'best-practice' to get administrator privileges on the self hosted Tasking Manager and how detailed to describe the procedure.

closes #5008

@SlowMo24 SlowMo24 changed the title make docker defaults more useful for local testing setup and update documentation Draft: make docker defaults more useful for local testing setup and update documentation Apr 9, 2022
@SlowMo24 SlowMo24 closed this Apr 9, 2022
@SlowMo24
Copy link
Author

SlowMo24 commented Apr 9, 2022

sorry created this PR prematurely. Will rework and eventually reopen -> adapted and reopened

@SlowMo24 SlowMo24 changed the title Draft: make docker defaults more useful for local testing setup and update documentation Make docker defaults more useful for local testing setup and update documentation Apr 15, 2022
@SlowMo24 SlowMo24 reopened this Apr 15, 2022
@sonarcloud
Copy link

sonarcloud bot commented Apr 15, 2022

Please retry analysis of this Pull-Request directly on SonarCloud.

@Aadesh-Baral Aadesh-Baral self-requested a review April 21, 2022 05:55
@Aadesh-Baral
Copy link
Contributor

Hi, @SlowMo24 we are working to implement OAuth2.0 for OSM login on #5029 which will have some changes to setup TM. Will review it as soon as #5029 is merged.

Copy link
Contributor

@Aadesh-Baral Aadesh-Baral left a comment

Choose a reason for hiding this comment

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

I think that adding frontend/backend URL instructions with and without docker to example.env would be useful. Other than that looks good to me.

example.env Outdated Show resolved Hide resolved
example.env Outdated Show resolved Hide resolved
example.env Outdated Show resolved Hide resolved
example.env Outdated Show resolved Hide resolved
…ve traefik to dedicated file. update example.env to according to reviewer comments. Update documentation. Addresses issue hotosm#5313
@sonarcloud
Copy link

sonarcloud bot commented Sep 13, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@SlowMo24
Copy link
Author

Thank you @Aadesh-Baral for reviewing. I have updated the config and docker-compose so it uses the same ports as the local development setup. I have also addressed #5313 and simplified the whole docker configuration. Feel free to comment.

@dakotabenjamin dakotabenjamin added the containerization issues that relate to containers infrastructure label Oct 20, 2022
@SlowMo24
Copy link
Author

Hey, thanks for approving. I think there has been a rework of the documentation (there is now a docs-old folder in main) and there are merge-conflicts. Is there any action required from my side (i.e. should I have a look at the new docs?) or are you in the middle of a process there?

@Aadesh-Baral
Copy link
Contributor

Hi @SlowMo24 , I've picked a commit from this PR to #5463 and planning to work on that PR itself.

@eternaltyro
Copy link
Collaborator

Related to #5705

@eternaltyro eternaltyro self-assigned this Apr 14, 2023
@eternaltyro eternaltyro mentioned this pull request Apr 14, 2023
14 tasks
Copy link
Collaborator

@eternaltyro eternaltyro left a comment

Choose a reason for hiding this comment

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

This looks good to be merged. cc : @Aadesh-Baral this seems to only affect docker-compose setups and might not interfere with other merge requests in queue. Can we proceed?

@SlowMo24 thank you very much for these changes. We will improve over them in due course, but this is a good starting point for us.

@eternaltyro
Copy link
Collaborator

Seems like there are some conflicts after-all. I will review this tomorrow and see how we can incorporate these changes into the new docs hierarchy.

@Aadesh-Baral
Copy link
Contributor

This looks good to be merged. cc : @Aadesh-Baral this seems to only affect docker-compose setups and might not interfere with other merge requests in queue. Can we proceed?

LGTM. Please go ahead.

@ramyaragupathy
Copy link
Member

@mahesh-naxa - could you please verify if some of these issues have been fixed with the recent docker PRs? cc @spwoodcock @dakotabenjamin

@spwoodcock
Copy link
Member

spwoodcock commented Apr 11, 2024

The actual config changes aren't required anymore - they have since been updated.

The docs in the PR were definitely useful at the time too, but I think the docs and config have changed since then, so it's hard to reconcile.

Unfortunately, it may be best to close this PR. So sorry @SlowMo24, I think this fell through the cracks! The contribution was good 🙏

@mahesh-naxa
Copy link
Collaborator

His docs specifically on how to generate OSM Auth client/secret with screenshots are helpful imo.
Others have been addressed.

@SlowMo24
Copy link
Author

This MR was the result of me setting up my own tasking manager instance for a research project that I presented at SotM2022: https://gitlab.gistools.geog.uni-heidelberg.de/giscience/ideal-vgi/osm-multitag . At that time I struggled quite a bit with the documentation but especially with Traefik (see #5313 ). The project is since completed and I currently don't work with it any more (:thinking: should take down that server I set up back then). So I am out of date with your code-base on the topic.

Things happen, let's move forward: I am happy to support you (I also gained a bit more knowledge on Docker and Traefik since then ;-) )

Please tell me where you could use support and I will see what I can do. For example I could run the setup procedure again with the current documentation and create issues or MRs where I fail. Yet, I would need some info on who you actually target with the documentation and the docker setup. If it is meant to be your team-documentation and should limit the lottery factor we might think differently about it than if it was meant for what I did: random humans set up their own instance.
Or I could see If I can rebase this MR and reduce it the the parts that are still missing, if you think that is helpful.

@spwoodcock
Copy link
Member

Thanks so much for the offer @SlowMo24, very kind of you 😄

Testing our current setup and providing feedback on the config or documentation around it would be a huge help 🙏

Feel free to rebase this or create a new MR/PR as needed & we will be much quicker to review next time!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
containerization issues that relate to containers infrastructure scope: infrastructure
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TM not available after starting with docker-compose
7 participants