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

feat(docker): Introduce reworked docker setup with jar #1670

Merged
merged 42 commits into from
Mar 14, 2024

Commits on Mar 13, 2024

  1. feat(docker): Add the docker setup with jar

    This introduces a completely revamped docker setup. The missing parts are the workflows and the docker-compose.yml.
    
    Without any configuration the container uses an example yml config shipped with it.
    Graph locations are parsed from envs, json and yml files
    
    - Introduce container log levels and add adjustments
    - Upgrade build image to java 21 (still compiled to 17)
    MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    7fa3b09 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    548660f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4af066f View commit details
    Browse the repository at this point in the history
  4. chore(config-conversion): rework & add properties conversion

    - move application.yml validation to separate file
    - add error exit codes
    - use yq to edit & validate
    - use sed instead of awk (for os compatibility)
    - move comments to echo output
    
    - add a new script to parse application.yml to a properties file
    
    The scripts are using yq to make the rewrite process more robust.
    The less we use sed magic, the better.
    TheGreatRefrigerator authored and MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    2d44059 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d49eff8 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    81036e8 View commit details
    Browse the repository at this point in the history
  7. ci(workflow): Update the docker build & test to the new setup

    - use ors default port in container
    - Add a basic docker compose check for built image
    MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    eb9c2f4 View commit details
    Browse the repository at this point in the history
  8. feat(docker): Migrate BUILD_GRAPHS to REBUILD_GRAPHS

    This has been a misleading variable for some time. This introduces REBUILD_GRAPHS and keeps BUILD_GRAPHS in compatibility for now.
    MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    f68c21e View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    cab31cd View commit details
    Browse the repository at this point in the history
  10. fix(docker): Add more user related optimizations

    The setup now detects if the user runs the container with a less privileged user and prints out necessary data for that
    
    - improve container handling
    - add default java opts & information to docker-compose environment
    
    Co-authored-by: Amandus Butzer <[email protected]>
    MichaelsJP and TheGreatRefrigerator committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    e379d5d View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    46acc69 View commit details
    Browse the repository at this point in the history
  12. docs: adjust docker guide

    TheGreatRefrigerator authored and MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    6a86df2 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    1421c7d View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    fceeaa7 View commit details
    Browse the repository at this point in the history
  15. refactor: change config path in docker

    as ors is reading the config path from $HOME, this did not work
    when running ors in a container as root.
    We moved the config ors is using in the container to the default
    lookup location '/etc/openrouteservice'.
    
    introduces:
    - copying example config to ors-config.yml if it doesn't exist
    - not using example-config.yml by default
    - adjust docker-compose.yml to changes
    
    Co-authored-by: Jochen Haeussler <[email protected]>
    2 people authored and MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    fa5b822 View commit details
    Browse the repository at this point in the history
  16. refactor: use example-heidelberg.osm.gz

    switch to usage of copied file in /home/ors/files instead of root folder
    
    Co-authored-by: Julian Psotta <[email protected]>
    Co-authored-by: Jochen Haeussler <[email protected]>
    3 people committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    60b4677 View commit details
    Browse the repository at this point in the history
  17. feat(docker): Change the user example to 1000:1000

    The user needs to be 1000:1000 if anything else than 0:0 wants to be chosen. Else the image needs to be rebuild with the correct gid and uid.
    MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    7b67c71 View commit details
    Browse the repository at this point in the history
  18. feat(docker): Adjust the container config path

    The path will now default to /home/ors/config allowing for easier mounts and a more streamlined way to configure the container.
    MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    dd91ebf View commit details
    Browse the repository at this point in the history
  19. fix(docker): Migrate BASE_FOLDER to ORS_HOME

    This removes the redundant BASE_FOLDER and replaces a couple of more hard coded paths to ORS_HOME.
    MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    2967aa5 View commit details
    Browse the repository at this point in the history
  20. Configuration menu
    Copy the full SHA
    4c29fc2 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    701f7ac View commit details
    Browse the repository at this point in the history
  22. fix(docker): Make the writeability and existens check explicit

    It is good to have a more in depth feedback on what goes wrong.
    MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    fd9fd13 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    d6d910f View commit details
    Browse the repository at this point in the history
  24. Configuration menu
    Copy the full SHA
    c94294c View commit details
    Browse the repository at this point in the history
  25. fix(docker): Migrate to the default jar location

    This avoids users mounting and accidentally fiddling with the jar file.
    MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    4376c12 View commit details
    Browse the repository at this point in the history
  26. Configuration menu
    Copy the full SHA
    d80dc6d View commit details
    Browse the repository at this point in the history
  27. Configuration menu
    Copy the full SHA
    dd84f38 View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    e0b7c03 View commit details
    Browse the repository at this point in the history
  29. feat: changed volume name

    jhaeu authored and MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    324e709 View commit details
    Browse the repository at this point in the history
  30. Configuration menu
    Copy the full SHA
    7230d0f View commit details
    Browse the repository at this point in the history
  31. Configuration menu
    Copy the full SHA
    73531c4 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    40f992e View commit details
    Browse the repository at this point in the history
  33. fix(docker-compose): Adjust the image tag to local/openrouteservice:l…

    …atest
    
    This ensures that users that checkout the compose from main will either fail or if it was cloned with the repo will have the latest repo stage build as their docker image. The image line is adjusted in the release action so that the release artifacts compose files will always point to their subsequent image version on docker hub.
    MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    04bbc6a View commit details
    Browse the repository at this point in the history
  34. Configuration menu
    Copy the full SHA
    5ae4651 View commit details
    Browse the repository at this point in the history
  35. Configuration menu
    Copy the full SHA
    92a58ed View commit details
    Browse the repository at this point in the history
  36. chore: Remove dev dependencies

    Curl and openssl are not needed for the final image.
    MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    f607eff View commit details
    Browse the repository at this point in the history
  37. Configuration menu
    Copy the full SHA
    7d6c763 View commit details
    Browse the repository at this point in the history
  38. Configuration menu
    Copy the full SHA
    f762dff View commit details
    Browse the repository at this point in the history
  39. fix(dockerfile): Move the config env setting further down and adjust …

    …the config loading messages
    
    The enhanced messages ensure that the user knows that a config is either read by ENV or as a fallback when existing in the config folder.
    MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    72885d6 View commit details
    Browse the repository at this point in the history
  40. fix(dockerfile): Add curl again

    Curl is necessary for the health check in the docker-compose.yml
    MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    648f9bb View commit details
    Browse the repository at this point in the history
  41. fix(dockerfile): Replace curl with wget

    Wget is provided by default and can also be used for the health check. One dependency less :).
    MichaelsJP committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    f643846 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Configuration menu
    Copy the full SHA
    c5a92e9 View commit details
    Browse the repository at this point in the history