## Setup -To run Cms with the rest of the application, see the project [development](../README.md#development) setup. +**RECOMMENDED:** To run Cms with the rest of the application, see the project [development](../README.md#development) setup. ### Development 1. Install [docker](https://docs.docker.com/get-docker/) -2. Add strapi.sql to `/` -3. Start a new db container from MySQL `yarn run make-db` +3. Start a new docker container running postgres `yarn run make-db` 4. Install dependencies `yarn install` 5. Start the development server `yarn develop` Additional scripts: -* Start an existing db container `yarn db` -* Connect to the MySQL bash `yarn db-bash` +* Start an existing db container `yarn db-start` +* Connect to the postgres bash `yarn db-bash`
## API `/` -Built with [Node](https://nodejs.org/en/), [Koa](https://github.com/koajs/koa#readme), and [Bookshelf](https://bookshelfjs.org/), the REST API enables CRUD functionality with the application's content. Authentication is enabled via JWTs. The current database is sqlite3 running locally. +Built with [Node](https://nodejs.org/en/), [Koa](https://github.com/koajs/koa#readme), and [Bookshelf](https://bookshelfjs.org/), the REST API enables CRUD functionality with the application's content. Authentication is enabled via JWTs. The dbms is [PostgreSQL](https://www.postgresql.org/). ### Entity Relationships diff --git a/cms/config/environments/development/database.json b/cms/config/environments/development/database.json index 0c9d71b1..b26e33a0 100644 --- a/cms/config/environments/development/database.json +++ b/cms/config/environments/development/database.json @@ -4,23 +4,21 @@ "default": { "connector": "bookshelf", "settings": { - "client": "mysql", + "client": "postgres", "host": "${process.env.DATABASE_HOST || '127.0.0.1'}", - "port": "3306", + "port": "5432", "database": "strapi", - "username": "root", - "password": "pass" - }, - "options": {} - }, - "sqlite3": { - "connector": "bookshelf", - "settings": { - "client": "sqlite", - "filename": ".tmp/data.db" + "username": "postgres", + "password": "postgres" }, "options": { - "useNullAsDefault": true + "pool": { + "min": 0, + "max": 15, + "idleTimeoutMillis": 30000, + "createTimeoutMillis": 30000, + "acquireTimeoutMillis": 30000 + } } } } diff --git a/cms/config/environments/production/database.js b/cms/config/environments/production/database.js new file mode 100644 index 00000000..b3b9d7ae --- /dev/null +++ b/cms/config/environments/production/database.js @@ -0,0 +1,43 @@ +/** + * parses a PostgreSQL DB connection URL into the parts needed + * by Strapi. Without this, heroku may throw ECONNREFUSED 127.0.0.1:xxxx. + */ + +const url = require('url'); + +let settings = { + client: 'postgres' +}; + +if (process.env.DATABASE_URL) { + const parsed = url.parse(process.env.DATABASE_URL, true); + const [username, password] = parsed.auth.split(':'); + + settings.host = parsed.hostname; + settings.port = Number(parsed.port); + settings.database = parsed.pathname.substr(1); + settings.username = username; + settings.password = password; + settings.ssl = { + "rejectUnauthorized": false + }; +} + +module.exports = { + defaultConnection: 'default', + connections: { + default: { + connector: 'bookshelf', + settings, + options: { + "pool": { + "min": 0, + "max": 15, + "idleTimeoutMillis": 30000, + "createTimeoutMillis": 30000, + "acquireTimeoutMillis": 30000 + } + } + } + } +}; \ No newline at end of file diff --git a/cms/config/environments/production/database.json b/cms/config/environments/production/database.json deleted file mode 100644 index bbe2c634..00000000 --- a/cms/config/environments/production/database.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "defaultConnection": "default", - "connections": { - "default": { - "connector": "bookshelf", - "settings": { - "client": "sqlite", - "host": "${process.env.DATABASE_HOST || '127.0.0.1'}", - "port": "${process.env.DATABASE_PORT || 27017}", - "database": "${process.env.DATABASE_NAME || 'strapi'}", - "username": "${process.env.DATABASE_USERNAME || ''}", - "password": "${process.env.DATABASE_PASSWORD || ''}" - }, - "options": {} - } - } -} diff --git a/cms/config/environments/production/server.json b/cms/config/environments/production/server.json index b85e19ae..6bc705ff 100644 --- a/cms/config/environments/production/server.json +++ b/cms/config/environments/production/server.json @@ -1,5 +1,5 @@ { - "host": "localhost", + "host": "0.0.0.0", "port": "${process.env.PORT || 1337}", "production": true, "proxy": { diff --git a/cms/config/environments/staging/database.json b/cms/config/environments/staging/database.json index bbe2c634..b26e33a0 100644 --- a/cms/config/environments/staging/database.json +++ b/cms/config/environments/staging/database.json @@ -4,14 +4,22 @@ "default": { "connector": "bookshelf", "settings": { - "client": "sqlite", + "client": "postgres", "host": "${process.env.DATABASE_HOST || '127.0.0.1'}", - "port": "${process.env.DATABASE_PORT || 27017}", - "database": "${process.env.DATABASE_NAME || 'strapi'}", - "username": "${process.env.DATABASE_USERNAME || ''}", - "password": "${process.env.DATABASE_PASSWORD || ''}" + "port": "5432", + "database": "strapi", + "username": "postgres", + "password": "postgres" }, - "options": {} + "options": { + "pool": { + "min": 0, + "max": 15, + "idleTimeoutMillis": 30000, + "createTimeoutMillis": 30000, + "acquireTimeoutMillis": 30000 + } + } } } -} +} \ No newline at end of file diff --git a/cms/package.json b/cms/package.json index 32f141fb..42993708 100644 --- a/cms/package.json +++ b/cms/package.json @@ -8,24 +8,23 @@ "start": "strapi start", "build": "strapi build", "strapi": "strapi", - "make-db": "docker run --name cms-db-dev -p 3306:3306 -e MYSQL_ROOT_PASSWORD=pass -v /var/lib/mysql -v `pwd`/strapi.sql:/docker-entrypoint-initdb.d/strapi.sql -d mysql:latest --default-authentication-plugin=mysql_native_password", - "db": "docker start cms-db-dev", - "db-bash": "docker exec -it cms-db-dev mysql -uroot -ppass" + "db-make": "docker run --name stem-c-db-dev -p 5432:5432 -e POSTGRES_DB=strapi -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -v /var/lib/postgresql/data -d postgres", + "db-start": "docker start stem-c-db-dev", + "db-bash": "docker exec -it stem-c-db-dev psql strapi postgres" }, "devDependencies": {}, "dependencies": { "knex": "<0.20.0", - "mysql": "latest", - "sqlite3": "^4.1.1", - "strapi": "3.0.0-beta.19.4", - "strapi-admin": "3.0.0-beta.19.4", - "strapi-connector-bookshelf": "^3.0.0-beta.19.5", - "strapi-plugin-content-manager": "3.0.0-beta.19.4", - "strapi-plugin-content-type-builder": "3.0.0-beta.19.4", - "strapi-plugin-email": "3.0.0-beta.19.4", - "strapi-plugin-upload": "3.0.0-beta.19.4", - "strapi-plugin-users-permissions": "3.0.0-beta.19.4", - "strapi-utils": "3.0.0-beta.19.4" + "pg": "^8.1.0", + "strapi": "3.0.0-beta.20.3", + "strapi-admin": "3.0.0-beta.20.3", + "strapi-connector-bookshelf": "3.0.0-beta.20.3", + "strapi-plugin-content-manager": "3.0.0-beta.20.3", + "strapi-plugin-content-type-builder": "3.0.0-beta.20.3", + "strapi-plugin-email": "3.0.0-beta.20.3", + "strapi-plugin-upload": "3.0.0-beta.20.3", + "strapi-plugin-users-permissions": "3.0.0-beta.20.3", + "strapi-utils": "3.0.0-beta.20.3" }, "author": { "name": "Nicholas Ionata" diff --git a/cms/public/index.html b/cms/public/index.html deleted file mode 100644 index 315cadcf..00000000 --- a/cms/public/index.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - -
-
-
- <% } %>
- <% if (!isInitialised) { %>
-
-
- <%= strapi.config.environment %>
-
- - The server is running successfully (v<%= strapi.config.info.version %>) -
-
-
- <%= serverTime %>
- Open the administration -
-
-
- <% } %>
-
- Let's get started!
-To discover the power provided by Strapi, you need to create an administrator.
- Create the first administrator -
- 
- 
- 
-
-
-
-
-
-
-
- <%= strapi.config.environment %>
-
- The server is running successfully.
-
-
- <%= serverTime %>
-diff --git a/compile/heroku.yml b/compile/heroku.yml deleted file mode 100644 index 132b0c2e..00000000 --- a/compile/heroku.yml +++ /dev/null @@ -1,5 +0,0 @@ -build: - docker: - web: Dockerfile -run: - web: "node app.js" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 8d92ea99..99c5d560 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,19 +1,8 @@ version: '3' services: - client: - container_name: sc-client-dev - build: ./client - ports: - - '3000:3000' - volumes: - - ./client:/usr/src/app - stdin_open: true - depends_on: - - cms - - compile cms: - container_name: sc-cms-dev + container_name: stem-c-cms-dev image: strapi/strapi environment: - DATABASE_HOST=db @@ -24,22 +13,20 @@ services: depends_on: - db compile: - container_name: sc-compile-dev + container_name: stem-c-compile-dev build: ./compile restart: always ports: - 8080:8080 db: - container_name: sc-db-dev - image: mysql + container_name: stem-c-db-dev + image: postgres restart: always - command: --default-authentication-plugin=mysql_native_password - environment: - MYSQL_ROOT_PASSWORD: pass - volumes: - - /var/lib/mysql - - ./cms/strapi.sql:/docker-entrypoint-initdb.d/strapi.sql ports: - - 3306:3306 - security_opt: - - seccomp:unconfined + - 5432:5432 + volumes: + - /var/lib/postgresql/data + environment: + POSTGRES_DB: strapi + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres \ No newline at end of file diff --git a/heroku.yml b/heroku.yml new file mode 100644 index 00000000..3f1a1a3d --- /dev/null +++ b/heroku.yml @@ -0,0 +1,9 @@ +setup: + addons: + - plan: heroku-postgresql + as: DATABASE +build: + docker: + web: Dockerfile +run: + web: "yarn start" \ No newline at end of file