Dockerize

.dockerignore

@@ -0,0 +1 @@
+node_modules

.node-version

@@ -1 +1 @@
-v6.3.1
+v8

.travis.yml

@@ -1,15 +1,9 @@
 language: node_js
 node_js:
-  - "6"
-env:
-  - CXX=g++-4.8
-addons:
-  postgresql: "9.3"
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
-before_script:
-  - psql -c 'create database forum;' -U postgres
-  - psql -c 'create database forum_test;' -U postgres
+  - "8"
+services:
+  - docker
+before_install:
+  docker-compose build
+script:
+  docker-compose run test

Dockerfile

@@ -0,0 +1,7 @@
+FROM node:8
+RUN mkdir /code
+ADD . /code
+RUN mkdir /code/build
+WORKDIR /code
+RUN npm install
+EXPOSE 80

Dockerfile.postgres

@@ -0,0 +1,10 @@
+FROM postgres:9.5
+
+ENV POSTGRES_DB forum
+ENV POSTGRES_USER forum
+
+# Init db
+RUN mkdir -p /docker-entrypoint-initdb.d
+COPY tables.sql /docker-entrypoint-initdb.d/
+
+RUN /etc/init.d/postgresql start

Dockerfile.test.postgres

@@ -0,0 +1,10 @@
+FROM postgres:9.5
+
+ENV POSTGRES_DB forum_test
+ENV POSTGRES_USER postgres
+
+# Init db
+RUN mkdir -p /docker-entrypoint-initdb.d
+COPY tables.sql /docker-entrypoint-initdb.d/
+
+RUN /etc/init.d/postgresql start

README.md

@@ -2,38 +2,32 @@
 
 Installation:
 =============
-`npm install`
+`docker-compose build`
 
-Persistent Tests:
+Persistent Tests (not yet working with Docker):
 =================
 `npm run test:watch`
 
 Run App Locally:
 ================
-`npm run start:dev`
+`docker-compose up web`
 
-Debug App:
+Debug App (not yet set up):
 ==========
 `npm run start:debug`
 
 Run Test Suite:
 ===============
-`npm test`
+`docker-compose run e2e`
 
-Run Test Suite in Debug Mode:
+Run Test Suite in Debug Mode (not yet working):
 =============================
 `npm run test:debug`
 
 Database
 ========
 
-```
-psql --command="create database forum;" && psql --echo-all --dbname=forum --file=tables.sql
-```
-
-Add /build Directory
-====================
-From installation directory root, `mkdir build`. This directory is needed so the app can write client-side bundles to it.
+Created on Install step.
 
 Register a User
 ===============
@@ -45,7 +39,7 @@ After registering, login using the user/pass you signed up with.
 
 Hot Reload
 ==========
-`npm run start:dev` does 'hot reloading' by default. This is subject to change.
+`docker-compose up web` does 'hot reloading' by default. This is subject to change.
 
 Environment Variables
 =====================

app.js

@@ -18,7 +18,7 @@ var cssnext = require('postcss-cssnext');
 rootRequire('config/environments')(app);
 app.set('io', require('socket.io').listen(httpServer));
 
-var conString = process.env.DATABASE_URL || "postgres://postgres@localhost/forum";
+var conString = process.env.DATABASE_URL || "postgres://postgres@db/forum";
 
 var Sequelize = require('sequelize');
 var sequelize = new Sequelize(conString);

app/components/Settings.jsx

@@ -222,6 +222,7 @@ var Settings = createReactClass({
               >
                 <option value="default">default</option>
                 <option value="classic">classic</option>
+                <option value="classic-dark">classic dark</option>
                 <option value="neoclassical">neoclassical</option>
                 <option value="giko">giko</option>
               </select>

app/components/index.jsx

@@ -23,7 +23,6 @@ module.exports = createReactClass({
   render: function() {
     return (
       <div className="routerContainer">
-        <link rel="stylesheet" href={`/stylesheets/v2-${this.props.value.settings.style}.css`} />
         <Router
           history={browserHistory}
           createElement={createElement(this.props)}

app/reducer-root.js

@@ -39,6 +39,8 @@ function handleSettings(state, action) {
   if (action.type === 'STYLECHANGE') {
     localStorage.setItem('forumStyleValue', action.value);
 
+    document.getElementById('forumstylesheet').href = `/stylesheets/v2-${window.localStorage.getItem('forumStyleValue')}.css`;
+
     return Object.assign({}, state, {
       style: action.value
     });

config/environments.js

@@ -2,7 +2,7 @@ module.exports = function(app){
   app.set('hostName', 'http://localhost');
   app.set('PORT', process.env.PORT || 3000);
   app.set('db-test', 'forum_test');
-  app.set('signupToken', 'e4baa79988b55b8f73affa415a0a7163');
+  app.set('signupToken', '4f84a8faebe285025181023b2247a51b');
 
 
   if (process.env.NODE_ENV === 'test') {

config/routes.js

@@ -18,15 +18,6 @@ var routes = function(app, passport){
 
     response.locals.user = request.session.user;
 
-    if (
-      app.get('hostName')
-        .match(request.get('host')
-          .split(':')[0]
-       ) === null
-    ) {
-      return response.redirect(301, app.get('hostName') + request.url);
-    }
-
     next();
   }, function(request, response, next) {
     if (request.session.user.id === 0){

docker-compose.yml

@@ -0,0 +1,38 @@
+version: "2"
+services:
+  web: 
+    build: .
+    ports: 
+      - 80:3000
+      - 4474:4474
+    command: bash -c 'while !</dev/tcp/db/5432; do sleep 1; done; npm run start:dev'
+    depends_on:
+      - db
+    environment:
+      - DATABASE_URL=postgres://forum@db:5432/forum
+      - PORT=3000   
+      - FORUM_STORAGE_ADAPTER=S3
+    volumes:
+      - .:/code
+      - /code/build
+      - /code/node_modules
+      - ./stylesheets:/code/stylesheets:rw
+  db:
+    build:
+      context: .
+      dockerfile: ./Dockerfile.postgres
+  # Testing
+  test:
+    build: .
+    ports:
+      - 80:3099
+    command: bash -c 'while !</dev/tcp/test_db/5432; do sleep 1; done; npm run test'
+    depends_on:
+      - test_db
+    environment:
+      - DATABASE_URL=postgres://postgres@test_db:5432/forum_test
+      - PORT=3099
+  test_db:
+    build:
+      context: .
+      dockerfile: ./Dockerfile.test.postgres

models/Post.js

@@ -1,5 +1,5 @@
 var Sequelize = require('sequelize');
-var sequelize = new Sequelize(process.env.DATABASE_URL || "postgres://postgres@localhost/forum");
+var sequelize = new Sequelize(process.env.DATABASE_URL || "postgres://postgres@db/forum");
 
 var Post = rootRequire('models/Post.orm')(sequelize);
 

models/User.js

@@ -1,5 +1,5 @@
 var Sequelize = require('sequelize');
-var sequelize = new Sequelize(process.env.DATABASE_URL || "postgres://postgres@localhost/forum");
+var sequelize = new Sequelize(process.env.DATABASE_URL || "postgres://postgres@db/forum");
 
 var User = rootRequire('models/User.orm')(sequelize);