diff --git a/.dockerignore b/.dockerignore index f56202ae..04606cab 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,6 +5,7 @@ data docker node_modules selenium +examples .all-contributorsrc .csslintrc .editorconfig diff --git a/examples/docker_for_load_balancing/docker-compose.yml b/examples/docker_for_load_balancing/docker-compose.yml index 3f2cee39..d9072caf 100644 --- a/examples/docker_for_load_balancing/docker-compose.yml +++ b/examples/docker_for_load_balancing/docker-compose.yml @@ -2,10 +2,14 @@ version: "3" services: redis: image: redis - mongo: - image: mongo + db: + image: postgres:10-alpine volumes: - - "./data/mongo:/data/db" + - ./pg_data:/var/lib/postgresql/data + environment: + POSTGRES_USER: root + POSTGRES_PASSWORD: root + POSTGRES_DB: ohmyform ui: image: ohmyform/ui environment: @@ -20,15 +24,16 @@ services: ADMIN_EMAIL: admin@local.host ADMIN_USERNAME: admin ADMIN_PASSWORD: admin - MONGODB_URI: mongodb://mongo/ohmyform + DATABASE_DRIVER: postgres + DATABASE_URL: postgresql://root:root@db:5432/ohmyform MAILER_URI: smtp://local.host REDIS_URL: redis://redis PORT: 5000 links: - - mongo + - db - redis ports: - "8090:5000" depends_on: - - mongo + - db - redis diff --git a/examples/docker_minimal/docker-compose.yml b/examples/docker_minimal/docker-compose.yml index d0d2b402..a61ef56e 100644 --- a/examples/docker_minimal/docker-compose.yml +++ b/examples/docker_minimal/docker-compose.yml @@ -1,22 +1,17 @@ version: "3" services: - mongo: - image: mongo - volumes: - - "./data/mongo:/data/db" ohmyform: image: ohmyform/ohmyform + volumes: + - "./data:/data" environment: CREATE_ADMIN: "TRUE" ADMIN_EMAIL: admin@local.host ADMIN_USERNAME: admin ADMIN_PASSWORD: admin - MONGODB_URI: mongodb://mongo/ohmyform + DATABASE_DRIVER: sqlite + DATABASE_URL: "sqlite:///data/data.sqlite" MAILER_URI: smtp://local.host - PORT: 5000 - links: - - mongo + LOGIN_NOTE: "Either login with admin:admin or create your own account to test OhMyForm" ports: - - "8080:5000" - depends_on: - - mongo + - "8080:3000" diff --git a/examples/docker_nginx/docker-compose.yml b/examples/docker_nginx/docker-compose.yml index bcd15adb..9475dd18 100644 --- a/examples/docker_nginx/docker-compose.yml +++ b/examples/docker_nginx/docker-compose.yml @@ -1,9 +1,13 @@ version: "3" services: - mongo: - image: mongo + db: + image: postgres:10-alpine volumes: - - "./data/mongo:/data/db" + - ./pg_data:/var/lib/postgresql/data + environment: + POSTGRES_USER: root + POSTGRES_PASSWORD: root + POSTGRES_DB: ohmyform nginx: image: nginx:alpine volumes: @@ -24,11 +28,12 @@ services: ADMIN_EMAIL: admin@local.host ADMIN_USERNAME: admin ADMIN_PASSWORD: admin - MONGODB_URI: mongodb://mongo/ohmyform + DATABASE_DRIVER: postgres + DATABASE_URL: postgresql://root:root@db:5432/ohmyform MAILER_URI: smtp://local.host REDIS_URL: redis://redis PORT: 5000 links: - - mongo + - db depends_on: - - mongo + - db