Split up exsiting docker image in mulitple containers (mysql, php-apache, npm) (opensourcepos#616)

Add company_name to searchable fields in Takings overview (opensourcepos#594)
Change tests to use elementBy instead of wait functions

Author: jekkos

.dockerignore

@@ -0,0 +1,21 @@
+node_modules
+bower_components
+tmp
+application/config/email.php
+application/config/database.php
+*.patch
+patches/
+.idea/
+git-svn-diff.py
+*.bash
+.swp
+.buildpath
+.project
+.settings/*
+*.swp
+*.rej
+*.orig
+*~
+*.~
+*.log
+application/sessions/*

.travis.yml

@@ -1,19 +1,14 @@
 sudo: false
 
-language: node_js
-
-node_js:
-      - "4.1"
-
 services:
     - docker
 
 before_install:
-    - docker build -t jekkos/opensourcepos .
-    - docker run -d jekkos/opensourcepos 
+    - docker-compose build
+    - docker-compose up -d
 
 script:
-    - docker exec -t -i $(docker ps | tail -n 1 | cut -d' ' -f1) /bin/sh -c "while ! curl http://localhost/index.php | grep username; do sleep 1; done; cd app && grunt mochaWebdriver:test" 
+    - docker-wait opensourcepos_php_1
 
 after_success:
     - docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"

Dockerfile

@@ -1,36 +1,19 @@
-FROM ubuntu:utopic
+FROM php:5-apache
 MAINTAINER jekkos
 RUN sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
-    mysql-client \
-    mysql-server \
-    apache2 \
-    libapache2-mod-php5 \
-    pwgen python-setuptools \
-    vim-tiny \
-    php5-mysql \
     php5-gd \
-    php5-apcu \
-    nodejs \
-    npm \
-    curl \
-    software-properties-common \
-    python \
-    git
-RUN easy_install supervisor
+    php5-apcu
 
-COPY ./docker/foreground.sh /etc/apache2/foreground.sh
-COPY ./docker/supervisord.conf /etc/supervisord.conf
-RUN chmod 755 /etc/apache2/foreground.sh
+RUN a2enmod rewrite
+RUN docker-php-ext-install mysql mysqli 
 
+WORKDIR /app
 COPY . /app
-RUN ln -s /usr/bin/nodejs /usr/bin/node
-RUN cd app && npm install
-RUN npm install -g grunt-cli
-RUN ln -s /usr/local/bin/grunt /usr/bin/grunt
 
-RUN ln -fs /app/* /var/www/html
-COPY ./docker/start_container.sh /start_container.sh
-RUN chmod 755 /start_container.sh
-EXPOSE 80 3306
-CMD ["/bin/bash", "/start_container.sh"]
+RUN cp application/config/database.php.tmpl application/config/database.php && \
+    sed -i -e "s/\(localhost\)/web/g" test/ospos.js && \
+    sed -i -e "s/\(user.*\?=.\).*\(.\)$/\1'${MYSQL_USERNAME}'\2/g" application/config/database.php && \
+    sed -i -e "s/\(password.*\?=.\).*\(.\)$/\1'${MYSQL_PASSWORD}'\2/g" application/config/database.php && \
+    sed -i -e "s/\(database.*\?=.\).*\(.\)$/\1'${MYSQL_DB_NAME}'\2/g" application/config/database.php && \
+    sed -i -e "s/\(hostname.*\?=.\).*\(.\)$/\1'${MYSQL_HOST_NAME}'\2/g" application/config/database.php

Dockerfile.test

@@ -0,0 +1,11 @@
+FROM digitallyseamless/nodejs-bower-grunt:5
+MAINTAINER jekkos
+
+apt-get install curl
+
+COPY Gruntfile.js .
+COPY package.json .
+COPY test .
+RUN npm install
+
+CMD ['while ! curl web/index.php | grep username; do sleep 1; done; && grunt mochaWebdriver:test']

application/models/Sale.php

@@ -56,6 +56,7 @@ public function search($search, $filters, $rows = 0, $limit_from = 0, $sort = 's
 					$this->db->like('last_name', $search);
 					$this->db->or_like('first_name', $search);
 					$this->db->or_like('CONCAT(customer.first_name, " ", last_name)', $search);
+					$this->db->or_like('company_name', $search);
 				$this->db->group_end();
 			}
 		}
@@ -196,6 +197,7 @@ public function get_search_suggestions($search, $limit = 25)
 			$this->db->like('last_name', $search);
 			$this->db->or_like('first_name', $search);
 			$this->db->or_like('CONCAT(first_name, " ", last_name)', $search);
+			$this->db->or_like('company_name', $search);
 			$this->db->order_by('last_name', 'asc');
 
 			foreach($this->db->get()->result_array() as $result)

database/database.sql

@@ -1,3 +1,4 @@
+USE ospos;
 -- >> This file is autogenerated from tables.sql and constraints.sql. Do not modify directly << --
 --
 -- Table structure for table `ospos_app_config`

docker-compose.test.yml

@@ -0,0 +1,39 @@
+version: '2'
+
+volumes:
+    ospos:
+        driver: local
+  
+services:
+    test: 
+        build:
+            context: .
+            dockerfile: Dockerfile.test
+    php:
+        build:
+            context: .
+            dockerfile: Dockerfile
+        links:
+            - mysql
+        ports:
+            - "80:80"
+        volumes:
+            - ospos:/var/www/html
+            - ospos:/app
+        environment:
+            - MYSQL_USERNAME=admin
+            - MYSQL_PASSWORD=pointofsale
+            - MYSQL_DB_NAME=ospos
+            - MYSQL_HOST_NAME=mysql
+
+    mysql:
+        image: mysql:5.7
+        environment:
+            - MYSQL_ROOT_PASSWORD=pointofsale
+            - MYSQL_DATABASE=ospos
+            - MYSQL_USER=admin
+            - MYSQL_PASSWORD=pointofsale
+        ports:
+            - "3306:3306"
+        volumes:
+            - ./database/database.sql:/docker-entrypoint-initdb.d/database.sql

docker-compose.yml

@@ -0,0 +1,35 @@
+version: '2'
+
+volumes:
+    ospos:
+        driver: local
+  
+services:
+    php:
+        build:
+            context: .
+            dockerfile: Dockerfile
+        links:
+            - mysql
+        ports:
+            - "80:80"
+        volumes:
+            - ospos:/var/www/html
+            - ospos:/app
+        environment:
+            - MYSQL_USERNAME=admin
+            - MYSQL_PASSWORD=pointofsale
+            - MYSQL_DB_NAME=ospos
+            - MYSQL_HOST_NAME=mysql
+
+    mysql:
+        image: mysql:5.7
+        environment:
+            - MYSQL_ROOT_PASSWORD=pointofsale
+            - MYSQL_DATABASE=ospos
+            - MYSQL_USER=admin
+            - MYSQL_PASSWORD=pointofsale
+        ports:
+            - "3306:3306"
+        volumes:
+            - ./database/database.sql:/docker-entrypoint-initdb.d/database.sql