Add Docker files to client and server (#41)

* Add Dockerfile to client side

* Cleanup

* Docker for django app (server) works

Author: nirgn975

README.md

@@ -1,4 +1,4 @@
-# An opinionated Angular - Django cluster
+# An opinionated Angular - Django RESTful cluster
 
 [![license][license-image]][license-url] [![Build Status][travis-image]][travis-url] [![codecov][codecov-image]][codecov-url] [![Dependency Status][dependencyci-image]][dependencyci-url] [![Donate][donate-image]][donate-url]
 
@@ -15,16 +15,19 @@ The repo is a production ready app, that uses `nginx` to serve static files (the
 
 Automatic installation of the project with docker, for development.
 
-1. Run `$ docker-compose up` to build the docker images and run them.
-3. Open the browser at [http://localhost:8000](http://localhost:8000) to see your Django (server) app.
+1. In `client` directory run `docker build -t client .` to build the Docker image.
+2. Run ```docker run -dit -v `pwd`:/usr/src -p 4200:4200 --name=client-con client``` to run a container from that image.
 3. Open the browser at [http://localhost:4200](http://localhost:4200) to see your Angular (client) app.
+4. In `server` directory run `docker build -t server .` to build the Docker image.
+5. Run ```docker run -dit -v `pwd`:/usr/src -p 8000:8000 --name=server-con server``` to run a container from that image.
+6. Open the browser at [http://localhost:8000](http://localhost:8000) to see your Django (server) app.
 
 If you want to install the project manually, go to the `/client` or `/server` directories and read the `README` file.
 
 ## Our Stack
 
-* [Angular 2.3](https://angular.io/)
-* [Django 1.10.5](https://www.djangoproject.com/)
+* [Angular](https://angular.io/)
+* [Django](https://www.djangoproject.com/)
 * [PostgreSQL](http://www.postgresql.org/)
 * [Docker](https://www.docker.com/)
 

client/Dockerfile

@@ -0,0 +1,24 @@
+FROM node:latest
+MAINTAINER Nir Galon <[email protected]>
+
+RUN useradd --user-group --create-home --shell /bin/false app
+
+ENV APP_NAME "client"
+ENV APP_USER "app"
+ENV HOME /home/$APP_USER
+ENV APP_DIR $HOME/$APP_NAME
+
+RUN npm install --global --silent angular-cli
+
+WORKDIR $APP_DIR
+COPY package.json $APP_DIR/package.json
+RUN npm install --silent && npm cache clean
+COPY . $APP_DIR
+RUN chown -R $APP_USER:$APP_USER $HOME/*
+
+USER $APP_USER
+WORKDIR $APP_DIR
+
+EXPOSE 4200
+
+CMD ["npm", "start"]

client/package.json

@@ -5,7 +5,7 @@
   "angular-cli": {},
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --proxy-config proxy.conf.json",
+    "start": "ng serve --host=0.0.0.0 --proxy-config proxy.conf.json",
     "lint": "tslint \"src/**/*.ts\" --project src/tsconfig.json --type-check && tslint \"e2e/**/*.ts\" --project e2e/tsconfig.json --type-check",
     "test": "ng test --single-run --code-coverage",
     "pree2e": "webdriver-manager update --standalone false --gecko false",

server/Dockerfile

@@ -0,0 +1,21 @@
+FROM python:3-onbuild
+MAINTAINER Nir Galon <[email protected]>
+
+RUN useradd --user-group --create-home --shell /bin/false app
+
+ENV APP_NAME "server"
+ENV APP_USER "app"
+ENV HOME /home/$APP_USER
+ENV APP_DIR $HOME/$APP_NAME
+
+WORKDIR $APP_DIR
+COPY requirements.txt $APP_DIR/requirements.txt
+
+COPY . $APP_DIR
+RUN chown -R $APP_USER:$APP_USER $HOME/*
+
+USER $APP_USER
+WORKDIR $APP_DIR
+
+EXPOSE 8000
+CMD ["gunicorn", "config.wsgi", "-b", "0.0.0.0:8000"]

server/README.md

@@ -1,4 +1,4 @@
-## server
+## Server
 
 The server (backend) side of the project written [Python](https://www.python.org/) using [Django 1.10.5](https://www.djangoproject.com/), [Django REST framework](http://www.django-rest-framework.org/).
 

server/requirements.txt

@@ -1,6 +1,6 @@
 # Install with: `pip install -r requirements.txt`
 
-Django==1.10.5
+Django==1.10.6
 psycopg2==2.6.2
 django-extensions==1.7.7
 gunicorn==19.6.0