first test with docker

.dockerignore

@@ -0,0 +1 @@
+**/node_modules

Dockerfile

@@ -0,0 +1,29 @@
+
+FROM node:10
+
+WORKDIR /usr/src/app
+
+COPY package.json .
+
+# install backend dependencies
+RUN yarn install
+
+# copy source
+COPY . .
+
+# install nodemon
+RUN yarn global add nodemon
+
+WORKDIR /usr/src/app/client
+
+# install frontend dependencies
+RUN yarn
+
+# build frontend
+RUN yarn build
+
+WORKDIR /usr/src/app
+
+EXPOSE 12300
+
+CMD [ "yarn", "run", "serve" ]

app/config.js

@@ -1,3 +1,38 @@
-const env = process.env.NODE_ENV
+let db = {}
-const conf = require('../config/config.' + env + '.json')
+if (process.env.NODE_ENV==='production') {
-module.exports = conf
+  db = {
+    host: process.env.DB_HOST,
+    username: process.env.DB_USER,
+    password: process.env.DB_PASS,
+    database: process.env.DB_NAME,
+    dialect: 'postgres'
+  }
+} else {
+  db = {
+    dialect: 'sqlite',
+    storage: './db.sqlite'
+  }
+}
+
+module.exports = {
+  locale: 'en',
+
+  title: process.env.TITLE || 'Put here your site name',
+  description: process.env.DESCRIPTION || 'A calendar for radical communities',
+
+  baseurl: process.env.BASE_URL || 'http://localhost:8080',
+  apiurl: process.env.API_URL || 'http://localhost:9000',
+  db,
+  admin: process.env.ADMIN_EMAIL,
+
+  smtp: {
+    host: process.env.SMTP_HOST,
+    secure: true,
+    auth: {
+      user: process.env.SMTP_USER,
+      pass: process.env.SMTP_PASS
+    }
+  },
+
+  secret: process.env.SMTP_SECRET
+}

app/db.js

@@ -1,9 +1,9 @@
 const Sequelize = require('sequelize')
-const env = process.env.NODE_ENV || 'development'
+const conf = require('./config.js')
-const conf = require('../config/config.' + env + '.json')
+console.error(conf.db)
 const db = new Sequelize(conf.db)
 
-// db.sync({ force: true })
+db.sync({ force: true })
 // db.sync()
 
 module.exports = db

client/config.js

@@ -1,14 +0,0 @@
-const env = process.env.NODE_ENV
-const beConf = require('../config/config.' + env + '.json')
-
-const conf = {
-  // environment
-  title: beConf.title,
-  description: beConf.description,
-
-  // base url
-  baseurl: beConf.baseurl,
-  apiurl: beConf.apiurl
-}
-
-export default conf

client/src/api.js

@@ -1,8 +1,7 @@
 import axios from 'axios'
-import config from '../config'
 import store from './store'
 const api = axios.create({
-  baseURL: config.apiurl,
+  baseURL: '/api',
   withCredentials: false,
   responseType: 'json',
   headers: {

client/src/components/Event.vue

@@ -13,14 +13,13 @@
 import { mapState, mapActions } from 'vuex';
 import api from '@/api'
 import filters from '@/filters'
-import config from '../../config'
 
 export default {
   props: ['event'],
   computed: {
     ...mapState(['user']),
     imgPath () {
-      return this.event.image_path && config.apiurl + '/../' + this.event.image_path
+      return this.event.image_path && this.event.image_path
     },
     mine () {
       return this.event.userId === this.user.id

client/src/components/EventDetail.vue

@@ -30,13 +30,12 @@
 import { mapState, mapActions } from 'vuex';
 import api from '@/api'
 import filters from '@/filters'
-import config from '../../config'
 
 export default {
   computed: {
     ...mapState(['user']),
     imgPath () {
-      return this.event.image_path && config.apiurl + '/../' + this.event.image_path
+      return this.event.image_path && this.event.image_path
     },    
     mine () {
       return this.event.userId === this.user.id || this.user.is_admin

client/src/components/Export.vue

@@ -52,7 +52,6 @@
 </template>
 <script>
 import { mapState } from 'vuex'
-import config from '../../config'
 import path from 'path'
 import filters from '../filters'
 import Calendar from '@/components/Calendar'
@@ -97,10 +96,10 @@ export default {
         }
       }
 
-      return `${config.apiurl}/export/${this.type}${query}`
+      return `${process.env.BASE_URL}/api/export/${this.type}${query}`
     },
     imgPath (event) {
-      return event.image_path && config.apiurl + '/../' + event.image_path
+      return event.image_path && event.image_path
     },
   },
   computed: {

config/config.development.json

@@ -1,27 +0,0 @@
-{
-  "env": "development",
-  "locale": "it",
-
-  "title": "Gancio",
-  "description": "Un calendario dei movimenti piemontesi",
-
-  "baseurl": "http://localhost:8080",
-  "apiurl": "http://localhost:9000/api",
-
-  "db": {
-      "storage": "./db.sqlite",
-      "dialect": "sqlite"
-    },
-  "admin": "lesion@autistici.org",
-
-  "smtp": {
-    "host": "mail.example.org",
-    "secure": true,
-    "auth": {
-      "user": "events@example.org",
-      "pass": ""
-    }
-  },
-
-  "secret": "nonosecretsuper"
-}

config/config.production.json

@@ -1,30 +0,0 @@
-{
-  "env": "production",
-  "locale": "en",
-
-  "title": "Put here your site name",
-  "description": "A calendar for radical communities",
-
-  "baseurl": "https://example.com",
-  "apiurl": "https://example.com/api",
-
-  "db": {
-    "dialect": "postgres",
-    "host": "localhost",
-    "database": "gancio",
-    "user": "user",
-    "password": "password"
-  },
-  "admin": "admin@example.com",
-
-  "smtp": {
-    "host": "mail.example.com",
-    "secure":"true",
-    "auth": {
-      "user": "admin@example.com",
-      "pass": ""
-    }
-  },
-
-  "secret": "randomstringhere"
-}

docker-compose.yml

@@ -0,0 +1,27 @@
+
+version: '3.5'
+
+services:
+  db:
+    image: 'postgres:latest'
+    environment:
+      POSTGRES_PASSWORD: 12345
+      POSTGRES_USER: postgres
+      POSTGRES_DB: gancio
+
+  app:
+    build: .
+    ports:
+      - '12300:12300'
+
+    env_file: .env
+    environment:
+      PORT: 12300
+      DB_HOST: db
+      DB_PASS: 12345
+      DB_USER: postgres
+      DB_NAME: gancio
+
+    links:
+      - db
+

package.json

@@ -2,8 +2,8 @@
   "name": "gancio",
   "main": "server.js",
   "scripts": {
-    "serve": "NODE_ENV=production PORT=9000 nodemon server.js",
+    "serve": "NODE_ENV=production nodemon server.js",
-    "dev": "NODE_ENV=development PORT=9000 nodemon server.js"
+    "dev": "NODE_ENV=development nodemon server.js"
   },
   "dependencies": {
     "bcrypt": "^3.0.2",
@@ -18,6 +18,7 @@
     "morgan": "^1.7.0",
     "multer": "^1.4.1",
     "mysql2": "^1.6.4",
+    "pg": "^7.8.1",
     "pug": "^2.0.3",
     "sequelize": "^4.41.0",
     "sqlite3": "^4.0.3"