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.

Sign up for GitHub

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

Jump to bottom

Add Docker Compose Support #2406

Closed
wants to merge 51 commits into from
Closed

Add Docker Compose Support #2406

wants to merge 51 commits into from

Commits on Oct 22, 2019

  1. Add Dockerfile for rails app 

    added Dockerfile for the ruby on rails app inside a separate docker directory. this will build a image from the official ruby (specifically ruby:2.5-slim).
    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    5fdf823 View commit details
    Browse the repository at this point in the history

  2. Modify Dockerfile to fix comment for postgresql-client installation e… 

    …rror

postgresql-client throws a dpkg error when it can't create a softlink in for man page and aborts installation. found a solve at stack overflow and modified Dockerfile to add a comment to mention the problem with slove source.
    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    7e5553c View commit details
    Browse the repository at this point in the history

  3. Modify Dockerfile to separate apt cache clean, npm comment, and remov… 

    …ed jobs from bundle install

modified Dockerfile to separate apt-get cache cleaning command, added a comment explaining why and how npm is added and removed --jobs flag from bundle install command
    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    39269fd View commit details
    Browse the repository at this point in the history

  4. Add docker_postgres.sh for PostgreSQL extension and functions 

    added docker_postgres.sh for PostgreSQL extension and functions that installs PostgreSQL Btree-gist Extension, compiles libpgosm.so and installs maptile_for_point, tile_for_point and xid_to_int4 functions
    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    1e5dfea View commit details
    Browse the repository at this point in the history

  5. Add Dockerfile.postgres for postgres app 

    added Dockerfile.postgres for the postgres database app. this will build a image from the official postgres (specifically postgres:9.4) image.
    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    c03fcd0 View commit details
    Browse the repository at this point in the history

  6. Add docker-compose.yml to build the complete app

    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    c66841a View commit details
    Browse the repository at this point in the history

  7. modify Dockerfile.postgres to fix script path

    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    b19e46b View commit details
    Browse the repository at this point in the history

  8. modify Dockerfile.postgres to upgrade postgres image to 11

    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    e8d364b View commit details
    Browse the repository at this point in the history

  9. modify Dockerfile to change postgresql-client package and install pha… 

    …ntomjs via npm

modified Dockerfile to changes postgresql-client package from postgresql-client-10 to postgresql-client, and added phantomjs installation via npm
    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    5d685e7 View commit details
    Browse the repository at this point in the history

  10. modify docker-compose.yml to fix context path

    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    91b69b1 View commit details
    Browse the repository at this point in the history

  11. add DOCKER.md file with docker setup instructions

    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    a1ab596 View commit details
    Browse the repository at this point in the history

  12. add .dockerignore file to list ignorable file for docker

    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    59b399e View commit details
    Browse the repository at this point in the history

  13. modify DOCKER.md to add database population

    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    cf63d94 View commit details
    Browse the repository at this point in the history

  14. modify DOCKER.md to add app config

    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    afdc9e9 View commit details
    Browse the repository at this point in the history

  15. moved docker_postgres.sh to docker directory

    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    ed004c7 View commit details
    Browse the repository at this point in the history

  16. modify Dockerfile.postgres file to change pgsql script location 

    modified Dockerfile.postgres file to changes docker_postgres.sh location from db to docker
    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    d382d4c View commit details
    Browse the repository at this point in the history

  17. modify Dockerfile.postgres file to add app location and gem install 

    modified Dockerfile.postgres file to add app location setup and gem install via bundle
    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    da0b13c View commit details
    Browse the repository at this point in the history

  18. modify Dockerfile.postgres file to move db function directory 

    modified Dockerfile.postgres file to move database function directory from /db to /app/db
    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    27ff12e View commit details
    Browse the repository at this point in the history

  19. modify docker_postgres.sh to fix libpgosm location 

    modified docker_postgres.sh to fix the location of libpgosm as it moved from /db/functions to /app/db/functions
    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    7754f8f View commit details
    Browse the repository at this point in the history

  20. modify Dockerfile to add osmosis 

    modified Dockerfile to add osmosis package needed for populating database with osm extract
    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    d51662c View commit details
    Browse the repository at this point in the history

  21. modify DOCKER.md to add osmosis instructions 

    modified DOCKER.md to add osmosis instructions needed to use osmosis and populate database
    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    bc75e4e View commit details
    Browse the repository at this point in the history

  22. modify Dockerfile.postgres to add ruby compilation 

    modified Dockerfile.postgres to add ruby compilation from source as we need ruby=>2.4 and also removed bundle installation via gem install command because bundle is already compiled installed while ruby source is being compiled and installed.
    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    f759f40 View commit details
    Browse the repository at this point in the history

  23. modify Dockerfile.postgres to change owner to postgres

    @fazlerabbi37 @jalessio
    fazlerabbi37 authored and jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    d64c706 View commit details
    Browse the repository at this point in the history

  24. Reorganize docker-compose files

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    bfc205f View commit details
    Browse the repository at this point in the history

  25. Require newer version of docker-compose

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    2702431 View commit details
    Browse the repository at this point in the history

  26. Re-org includes following directory re-org

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    5fcbabe View commit details
    Browse the repository at this point in the history

  27. Use currently 'supported' version of Postgres

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    50dce9a View commit details
    Browse the repository at this point in the history

  28. Move 'ADD' later in build process to preserve layer caches

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    8c4a16f View commit details
    Browse the repository at this point in the history

  29. Dockerfile cleanup to minimize image layers

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    2e887d0 View commit details
    Browse the repository at this point in the history

  30. Drop unneeded image names from docker-compose.yml

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    a62ead6 View commit details
    Browse the repository at this point in the history

  31. Update build context for 'db'

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    6b77b8d View commit details
    Browse the repository at this point in the history

  32. More re-org of main Dockerfile for better layer caching

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    c68ce09 View commit details
    Browse the repository at this point in the history

  33. Remove dockerignore file for less build surprises 

    Until the Docker build context proves to be big enough
to actually be a performance problem.
    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    56019ec View commit details
    Browse the repository at this point in the history

  34. Fix db Dockerfile path 

    Fallout from changing build context for this image
    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    2179344 View commit details
    Browse the repository at this point in the history

  35. Port forward Postgres to a less common port to avoid conflicts

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    2104509 View commit details
    Browse the repository at this point in the history

  36. Rename Postgres init script

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    2bd5abb View commit details
    Browse the repository at this point in the history

  37. Build shared object in Dockerfile, not at run time

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    707da60 View commit details
    Browse the repository at this point in the history

  38. Use PG11. Don't install Ruby - just get headers for PG extension.

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    b8a2a9a View commit details
    Browse the repository at this point in the history

  39. Add db name to database URL for docker-compose

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    4105547 View commit details
    Browse the repository at this point in the history

  40. Temporary(?) Makefile for docker-compose shortcuts

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    609afda View commit details
    Browse the repository at this point in the history

  41. This project doesn't require PostGIS

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    c9e8721 View commit details
    Browse the repository at this point in the history

  42. Remove line from Makefile which was not working as expected

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    7fcfbe9 View commit details
    Browse the repository at this point in the history

  43. Remove need for shared library PostgreSQL functions 

    This is no longer needed as of PR
openstreetmap#2383
    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    a3a989f View commit details
    Browse the repository at this point in the history

  44. First pass modifications on Docker README

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    e28ab32 View commit details
    Browse the repository at this point in the history

  45. Use Docker volume to persist Postgres data on host filesystem

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    8be4a40 View commit details
    Browse the repository at this point in the history

  46. Exlude PGDATA directory from Docker build context 

    Without this there are permissions issues on the host
filesystem.
    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    37142f1 View commit details
    Browse the repository at this point in the history

  47. Use 'openstreetmap' user to connect to db

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    b397c05 View commit details
    Browse the repository at this point in the history

  48. Add a helper command for populating the database 

    Make it easy to get up and running quickly
    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    c0ec8bc View commit details
    Browse the repository at this point in the history

  49. DOCKER readme tweaks

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    7748dd4 View commit details
    Browse the repository at this point in the history

  50. Move db config to yml file

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    ba08eec View commit details
    Browse the repository at this point in the history

  51. Add helper command for running tests w/Docker

    @jalessio
    jalessio committed Oct 22, 2019
    Configuration menu
    Copy the full SHA
    cb2881c View commit details
    Browse the repository at this point in the history