Merge branch 'dockerized' into 'development'

Dockerized

See merge request saburly/wiaas/wiaas-legacy!1

.gitignore

@@ -0,0 +1,2 @@
+/public
+/log

README.md

@@ -12,13 +12,13 @@
 - install wamp or LAMP depending on the envirorment (or any other service that provides php + mysql)
     Make sure that "rewrite" is allowed and enabled in APACHE server
 
-- create /public folder and configure apache to serve this folder as root folder
+- create `public` folder (in root of the project) and configure apache to serve this folder as root folder
 
 - install composer
 
--run `php composer install` in api-wiaas folder to get required libraries
+-run `php composer install` (or just `composer install` if composer is installed globally) in api-wiaas folder to get required libraries
 
-- create symlink to for /api-wiaas in /public directory 
+- create symlink to for `api-wiaas` in `public` directory
 
 -for old interface run `grunt` in api-wiaas to generated stylesheets
 
@@ -26,10 +26,18 @@
 ## APPLICATION CLIENT
 JavasScript (React + Redux)
 
-- npm install in client-wiaas to update required libraries
+- npm install in `client-wiaas` to update required libraries
 
 - npm run build
 
-- copy content of build folder to  /public directory
+- copy content of `build` folder to  `public` directory
 
 - npm start in client-wiaas to start the applicaiton
+
+
+## DOCKER
+
+- install docker-ce and docker-compose
+- from root of the project, execute `docker-compose build` and then `docker-compose up`
+
+Application is now available on http://localhost:8000

api-wiaas/config.php

@@ -34,14 +34,17 @@ if(APPLICATION_MODE === 'PROD'){
 
 defined('ADMIN_MAIL') ? null : define('ADMIN_MAIL', 'dash-admin@saguaronet.ro');
 
-defined('DB_SERVER') ? null : define('DB_SERVER', 'localhost:3306');
+if (!defined('DB_SERVER')){
-defined('DB_USER') ? null : define('DB_USER', 'developer');
+    getenv('DB_SERVER') ? define('DB_SERVER', getenv('DB_SERVER')) : define('DB_SERVER', 'db');
-defined('DB_PASS') ? null : define('DB_PASS', 'developer');
+}
-
+if (!defined('DB_USER')){
-if(APPLICATION_MODE === 'TEST'){
+    getenv('DB_USER') ? define('DB_USER', getenv('DB_USER')) : define('DB_USER', 'developer');
-    defined('DB_NAME') ? null : define('DB_NAME', 'ricoh_dash_test');
+}
-}else{
+if (!defined('DB_PASS')){
-    defined('DB_NAME') ? null : define('DB_NAME', 'ricoh_dash');
+    getenv('DB_PASS') ? define('DB_PASS', getenv('DB_PASS')) : define('DB_PASS', 'developer');
+}
+if (!defined('DB_NAME')){
+    getenv('DB_NAME') ? define('DB_NAME', getenv('DB_NAME')) : define('DB_NAME', 'ricoh_dash');
 }
 
 const TABLES = array(
@@ -149,7 +152,11 @@ const SUPPORT_MAIL_LIST = array(
 
 const SESSION_LIFE_TIME = 60 * 24;
 
-const WIAAS_URL = APPLICATION_MODE === 'PROD' ? 'http://localhost' : 'http://localhost';
+if (!defined('WIAAS_URL')){
+    getenv('WIAAS_URL') ? define('WIAAS_URL', $_ENV['WIAAS_URL']) : define('WIAAS_URL', 'http://localhost:8000');
+}
+
+const WIAAS_URL = APPLICATION_MODE === 'PROD' ? 'http://localhost:8000' : 'http://localhost:8000';
 const WORKING_DAYS_KEY = 'you@gmail.com';
 const JWT_API_SECRET_KEY = 'W11A$_AP1_S3CR3T';
 const JWT_ALGORITHM ='HS512';

client-wiaas/package.json

@@ -8,6 +8,7 @@
     "bootstrap": "^4.0.0-beta.2",
     "flag-icon-css": "^2.8.0",
     "font-awesome": "^4.7.0",
+    "glamor": "^2.20.40",
     "js-file-download": "^0.4.1",
     "jwt-decode": "^2.2.0",
     "moment": "^2.19.1",

client-wiaas/src/config.js

@@ -1,17 +1,19 @@
+import processReducer from "./reducers/orders/processReducers";
+
 const APPLICAITON_MODE = 'DEV';
 const APPLICATION_NAME = 'Co-Market';
 const API_VERSION = 'v2';
 
 const API_SERVER_BASE = (() => {
     if(APPLICAITON_MODE === 'TEST'){
-        return 'http://localhost/api-wiaas';
+        return process.env.REACT_APP_TEST_URL;
     }
 
     if(APPLICAITON_MODE === 'PROD'){
-        return 'http://localhost/api-wiaas';
+        return process.env.REACT_APP_PROD_URL;
     }
 
-    return 'http://localhost/api-wiaas';
+    return process.env.REACT_APP_DEV_URL;
 })();
 
 const API_SERVER = API_SERVER_BASE + '/' + API_VERSION;

docker-compose.yml

@@ -0,0 +1,21 @@
+version : '2'
+
+services:
+  web:
+    build:
+      context: .
+      dockerfile: php.dockerfile
+    volumes:
+      - ./log/apache2/:/var/log/apache2/
+    ports:
+      - '8000:80'
+    depends_on:
+      - db
+    #use links keywoard to use db as a known host "db" to connect to database
+    links:
+      - db
+
+  db: 
+    build: ./docker/mysql
+    ports:
+      - '13306:3306'

docker/mysql/Dockerfile

@@ -0,0 +1,8 @@
+FROM mysql:5.7
+
+ENV MYSQL_ROOT_PASSWORD=root \
+    MYSQL_DATABASE=ricoh_dash \
+    MYSQL_USER=developer \
+    MYSQL_PASSWORD=developer
+
+ADD comarket_2018-06-08.sql /docker-entrypoint-initdb.d/dump.sql

docker/php/apache2.conf

@@ -0,0 +1,227 @@
+# This is the main Apache server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See http://httpd.apache.org/docs/2.4/ for detailed information about
+# the directives and /usr/share/doc/apache2/README.Debian about Debian specific
+# hints.
+#
+#
+# Summary of how the Apache 2 configuration works in Debian:
+# The Apache 2 web server configuration in Debian is quite different to
+# upstream's suggested way to configure the web server. This is because Debian's
+# default Apache2 installation attempts to make adding and removing modules,
+# virtual hosts, and extra configuration directives as flexible as possible, in
+# order to make automating the changes and administering the server as easy as
+# possible.
+
+# It is split into several files forming the configuration hierarchy outlined
+# below, all located in the /etc/apache2/ directory:
+#
+#	/etc/apache2/
+#	|-- apache2.conf
+#	|	`--  ports.conf
+#	|-- mods-enabled
+#	|	|-- *.load
+#	|	`-- *.conf
+#	|-- conf-enabled
+#	|	`-- *.conf
+# 	`-- sites-enabled
+#	 	`-- *.conf
+#
+#
+# * apache2.conf is the main configuration file (this file). It puts the pieces
+#   together by including all remaining configuration files when starting up the
+#   web server.
+#
+# * ports.conf is always included from the main configuration file. It is
+#   supposed to determine listening ports for incoming connections which can be
+#   customized anytime.
+#
+# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
+#   directories contain particular configuration snippets which manage modules,
+#   global configuration fragments, or virtual host configurations,
+#   respectively.
+#
+#   They are activated by symlinking available configuration files from their
+#   respective *-available/ counterparts. These should be managed by using our
+#   helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See
+#   their respective man pages for detailed information.
+#
+# * The binary is called apache2. Due to the use of environment variables, in
+#   the default configuration, apache2 needs to be started/stopped with
+#   /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
+#   work with the default configuration.
+
+
+# Global configuration
+#
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# NOTE!  If you intend to place this on an NFS (or otherwise network)
+# mounted filesystem then please read the Mutex documentation (available
+# at <URL:http://httpd.apache.org/docs/2.4/mod/core.html#mutex>);
+# you will save yourself a lot of trouble.
+#
+# Do NOT add a slash at the end of the directory path.
+#
+#ServerRoot "/etc/apache2"
+
+#
+# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
+#
+#Mutex file:${APACHE_LOCK_DIR} default
+
+#
+# The directory where shm and other runtime files will be stored.
+#
+
+DefaultRuntimeDir ${APACHE_RUN_DIR}
+
+#
+# PidFile: The file in which the server should record its process
+# identification number when it starts.
+# This needs to be set in /etc/apache2/envvars
+#
+PidFile ${APACHE_PID_FILE}
+
+#
+# Timeout: The number of seconds before receives and sends time out.
+#
+Timeout 300
+
+#
+# KeepAlive: Whether or not to allow persistent connections (more than
+# one request per connection). Set to "Off" to deactivate.
+#
+KeepAlive On
+
+#
+# MaxKeepAliveRequests: The maximum number of requests to allow
+# during a persistent connection. Set to 0 to allow an unlimited amount.
+# We recommend you leave this number high, for maximum performance.
+#
+MaxKeepAliveRequests 100
+
+#
+# KeepAliveTimeout: Number of seconds to wait for the next request from the
+# same client on the same connection.
+#
+KeepAliveTimeout 5
+
+
+# These need to be set in /etc/apache2/envvars
+User ${APACHE_RUN_USER}
+Group ${APACHE_RUN_GROUP}
+
+#
+# HostnameLookups: Log the names of clients or just their IP addresses
+# e.g., www.apache.org (on) or 204.62.129.132 (off).
+# The default is off because it'd be overall better for the net if people
+# had to knowingly turn this feature on, since enabling it means that
+# each client request will result in AT LEAST one lookup request to the
+# nameserver.
+#
+HostnameLookups Off
+
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog ${APACHE_LOG_DIR}/error.log
+
+#
+# LogLevel: Control the severity of messages logged to the error_log.
+# Available values: trace8, ..., trace1, debug, info, notice, warn,
+# error, crit, alert, emerg.
+# It is also possible to configure the log level for particular modules, e.g.
+# "LogLevel info ssl:warn"
+#
+LogLevel warn
+
+# Include module configuration:
+IncludeOptional mods-enabled/*.load
+IncludeOptional mods-enabled/*.conf
+
+# Include list of ports to listen on
+Include ports.conf
+
+
+# Sets the default security model of the Apache2 HTTPD server. It does
+# not allow access to the root filesystem outside of /usr/share and /var/www.
+# The former is used by web applications packaged in Debian,
+# the latter may be used for local directories served by the web server. If
+# your system is serving content from a sub-directory in /srv you must allow
+# access here, or in any related virtual host.
+<Directory />
+	Options FollowSymLinks
+	AllowOverride None
+	Require all denied
+</Directory>
+
+<Directory /usr/share>
+	AllowOverride None
+	Require all granted
+</Directory>
+
+<Directory /var/www/>
+	Options Indexes FollowSymLinks
+	AllowOverride All
+	Require all granted
+</Directory>
+
+#<Directory /srv/>
+#	Options Indexes FollowSymLinks
+#	AllowOverride None
+#	Require all granted
+#</Directory>
+
+
+
+
+# AccessFileName: The name of the file to look for in each directory
+# for additional configuration directives.  See also the AllowOverride
+# directive.
+#
+AccessFileName .htaccess
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being
+# viewed by Web clients.
+#
+<FilesMatch "^\.ht">
+	Require all denied
+</FilesMatch>
+
+
+#
+# The following directives define some format nicknames for use with
+# a CustomLog directive.
+#
+# These deviate from the Common Log Format definitions in that they use %O
+# (the actual bytes sent including headers) instead of %b (the size of the
+# requested file), because the latter makes it impossible to detect partial
+# requests.
+#
+# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended.
+# Use mod_remoteip instead.
+#
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %O" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+
+# Include of directories ignores editors' and dpkg's backup files,
+# see README.Debian for details.
+
+# Include generic snippets of statements
+IncludeOptional conf-enabled/*.conf
+
+# Include the virtual host configurations:
+IncludeOptional sites-enabled/*.conf
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

php.dockerfile

@@ -0,0 +1,31 @@
+FROM php:7.0-apache
+
+ENV REACT_APP_TEST_URL=http://localhost:8000/api-wiaas \
+    REACT_APP_PROD_URL=http://localhost:8000/api-wiaas \
+    REACT_APP_DEV_URL=http://legacy.wiaas.saburly.com/api-wiaas
+
+RUN apt-get update && apt-get install -y git unzip gnupg
+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
+RUN apt-get install -y nodejs
+
+RUN docker-php-ext-install pdo pdo_mysql mysqli
+RUN a2enmod rewrite
+
+COPY docker/php/apache2.conf /etc/apache2/
+COPY docker/php/composer.phar /usr/local/bin/composer
+
+RUN chmod 755 /usr/local/bin/composer
+
+COPY api-wiaas /home/wiaas/api-wiaas
+COPY client-wiaas /home/wiaas/client-wiaas
+
+WORKDIR /home/wiaas/api-wiaas/
+RUN composer install
+
+WORKDIR /home/wiaas
+RUN cp -r api-wiaas /var/www/html/
+
+WORKDIR /home/wiaas/client-wiaas
+RUN npm rebuild node-sass --force
+RUN npm install && npm run build 
+RUN cp -r build/* /var/www/html/