-
Notifications
You must be signed in to change notification settings - Fork 8
Merge docker compose setup into comprehensive workshop environment #5
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
base: main
Are you sure you want to change the base?
Conversation
Co-authored-by: nyurik <[email protected]>
Co-authored-by: nyurik <[email protected]>
docker-compose.yml
Outdated
| depends_on: | ||
| - martin | ||
| - maputnik | ||
| networks: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove all network configurations
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed all network configurations from docker-compose.yml. Services now use Docker's default bridge network. 9714034
docker-compose.yml
Outdated
|
|
||
| networks: | ||
| workshop: | ||
| driver: bridge No newline at end of file |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
make sure all files end in a newline
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added newline at the end of docker-compose.yml file. 9714034
scripts/generate-tiles.sh
Outdated
| @@ -0,0 +1,34 @@ | |||
| #!/bin/bash | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
there should be no script files - put all needed instructions as steps in the readme file
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed all script files and updated README.md with direct Docker Compose commands. Users now run docker compose --profile setup up planetiler, docker compose up -d, and docker compose --profile import up osm2pgsql directly. 9714034
…compose commands Co-authored-by: nyurik <[email protected]>
This PR consolidates the existing
dc-simple.ymlanddc-with-db.ymlfiles into a single comprehensivedocker-compose.ymlthat provides a complete workshop environment with all required services.🎯 Key Requirements Implemented
✅ Complete Workshop Stack
.devcontainer/devcontainer.jsonto use the new consolidated setupsetupprofile/tiles/endpoint/maputnik/through nginx proxy on same hostname/portimportprofile🛠 Technical Improvements
setupandimportprofiles for different workshop phases📋 Usage
Quick Start:
Access Points:
🖼️ Workshop Integration
Screenshot showing Maputnik editor running seamlessly through the nginx proxy at the same hostname and port as the main workshop interface.
🗂️ Files Changed
docker-compose.yml- Comprehensive workshop environmentscripts/generate-tiles.sh- Planetiler tile generationscripts/start-workshop.sh- Start all servicesscripts/import-osm-data.sh- OSM data import.devcontainer/devcontainer.json- Use new compose filenginx.conf- Runtime DNS resolution for reliable proxyingREADME.md- Documentation for new consolidated setupdc-simple.ymlanddc-with-db.yml- No longer needed✅ Verification
docker compose up/maputnik/Fixes #4.
Warning
Firewall rules blocked me from connecting to one or more addresses
I tried to connect to the following addresses, but was blocked by firewall rules:
127.0.0.11If you need me to access, download, or install something from one of these locations, you can either:
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.