Feature/docker element

.amber.yml

@@ -1,4 +1,4 @@
 type: app
-database: sqlite
+database: pg
 language: slang
 model: granite

Dockerfile

@@ -1,4 +1,4 @@
-FROM amberframework/amber:v0.10.0
+FROM amberframework/amber:v0.11.3
 
 WORKDIR /app
 

config/environments/development.yml

@@ -21,7 +21,7 @@ process_count: 1
 # ssl_key_file:
 # ssl_cert_file:
 redis_url: "redis://localhost:6379"
-database_url: sqlite3:./db/jumpcloud_connect_development.db
+database_url: "postgres://admin:password@db:5432/project_ci_development"
 auto_reload: true
 
 session:

config/environments/test.yml

@@ -21,7 +21,7 @@ process_count: 1
 # ssl_key_file:
 # ssl_cert_file:
 redis_url: "redis://localhost:6379"
-database_url: sqlite3:./db/jumpcloud_connect_test.db
+database_url: "postgres://admin:password@db:5432/project_ci_test"
 auto_reload: false
 
 session:

config/initializers/database.cr

@@ -1,6 +1,6 @@
-require "granite/adapter/sqlite"
+require "granite/adapter/pg"
 
-Granite::Adapters << Granite::Adapter::Sqlite.new({name: "sqlite", url: Amber.settings.database_url})
+Granite::Adapters << Granite::Adapter::Pg.new({name: "pg", url: Amber.settings.database_url})
 Granite.settings.logger = Amber.settings.logger.dup
 Granite.settings.logger.progname = "Granite"
 

docker-compose.yml

@@ -6,7 +6,7 @@ services:
     image: jumpcloud_connect
     command: amber watch
     environment:
-      DATABASE_URL: sqlite3:./db/jumpcloud_connect_development.db
+      DATABASE_URL: postgres://admin:password@db:5432/project_ci_development
     ports:
       - 3000:3000
     links:
@@ -21,19 +21,32 @@ services:
     image: jumpcloud_connect
     command: bash -c 'amber db migrate seed'
     environment:
-      DATABASE_URL: sqlite3:./db/jumpcloud_connect_development.db
+      DATABASE_URL: postgres://admin:password@db:5432/project_ci_development
     volumes:
       - .:/app
     links:
       - db
 
   db:
-    image: jumpcloud_connect
-    command: 'bash -c "ls > /dev/null"'
+    image: postgres
+    environment:
+      POSTGRES_USER: admin
+      POSTGRES_PASSWORD: password
+      POSTGRES_DB: project_ci_development
     volumes:
-    - db:/app/local/db
+      - db:/var/lib/postgresql/data
+
+  mailCatcher:
+    image: schickling/mailcatcher
+    environment: 
+      MAILCATCHER_PORT_1025_TCP_ADDR: 1025
+    ports:
+      - 1025:25
+      - 1080:1080
+
 
 volumes:
   db:
   nodes:
   shards:
+

shard.yml

@@ -33,9 +33,9 @@ dependencies:
     github: amberframework/jasper-helpers
     version: ~> 0.2.0
 
-  sqlite3:
-    github: crystal-lang/crystal-sqlite3
-    version: ~> 0.10.0
+  pg:
+    github: will/crystal-pg
+    version: ~> 0.15.0
 
   citrine-i18n:
     github: amberframework/citrine-i18n

src/models/user.cr

@@ -2,7 +2,7 @@ require "crypto/bcrypt/password"
 
 class User < Granite::Base
   include Crypto
-  adapter sqlite
+  adapter pg
   table_name users
 
   primary id : Int64