From f11c2d7a4dfb3776898547b99a8f7b5bc6fea94c Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Thu, 7 Jul 2016 13:17:48 +0200
Subject: [PATCH] Move init sql to data only container (#616) Update travis
 config to build new setup Add git sha-1 to ospos version string

---
 .gitattributes                |  1 +
 .travis.yml                   |  9 ++++++---
 application/config/config.php | 11 +++++++++++
 application/config/theme.php  | 15 ---------------
 database/Dockerfile           |  6 ++++++
 docker-cloud.yml              |  6 ++++--
 docker-compose.test.yml       |  4 ++++
 docker-compose.yml            |  8 ++++++--
 8 files changed, 38 insertions(+), 22 deletions(-)
 delete mode 100644 application/config/theme.php
 create mode 100644 database/Dockerfile

diff --git a/.gitattributes b/.gitattributes
index 32d68b41c..65fd95ef1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
 dist/ merge=ours
 application/language/**/*.php merge=ours
 text=auto
+application/config/config.php ident
diff --git a/.travis.yml b/.travis.yml
index 4e8b890ce..49794753f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,12 +13,15 @@ before_install:
     - curl -L https://github.com/docker/compose/releases/download/1.7.1/docker-compose-`uname -s`-`uname -m` > docker-compose
     - chmod +x docker-compose
     - sudo mv docker-compose /usr/local/bin
-    - docker-compose -v
-    - docker -v
 script:
     - docker-compose build
     - docker-compose up -d
 
 after_success:
-    - '[ -n ${DOCKER_USERNAME} ] && docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && docker tag opensourcepos_php jekkos/opensourcepos:$TRAVIS_BRANCH && docker push jekkos/opensourcepos'
+    - >
+        '[ -n ${DOCKER_USERNAME} ] && 
+        docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && 
+        docker tag opensourcepos_php jekkos/opensourcepos:$TRAVIS_BRANCH && 
+        docker tag opensourcepos_sqlscript jekkos/opensourcepos:sqlscript &&
+        docker push jekkos/opensourcepos'
 
diff --git a/application/config/config.php b/application/config/config.php
index 13142627a..e9f7ae6db 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -12,6 +12,17 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 */
 $config['application_version'] = '3.0.0';
 
+/*
+|--------------------------------------------------------------------------
+| Commit sha1
+|--------------------------------------------------------------------------
+|
+| This is the commit hash for the version you are currently using 
+|
+|
+*/
+$config['commit_sha1'] = '$Id$';
+
 /*
 |--------------------------------------------------------------------------
 | Internal to OSPOS XSS Clean
diff --git a/application/config/theme.php b/application/config/theme.php
deleted file mode 100644
index 807e85503..000000000
--- a/application/config/theme.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
-
-/*
-|--------------------------------------------------------------------------
-| theme name
-|--------------------------------------------------------------------------
-|
-| the theme folder name. If the folder doesn't exist it will use default theme
-|
-| The default theme for OSPOS is flatly: http://bootswatch.com/flatly/
-|
-|
-*/
-
-//$config['theme_name'] = 'spacelab';
diff --git a/database/Dockerfile b/database/Dockerfile
new file mode 100644
index 000000000..0491f81af
--- /dev/null
+++ b/database/Dockerfile
@@ -0,0 +1,6 @@
+FROM debian:jessie
+MAINTAINER jekkos
+
+ADD database.sql /docker-entrypoint-initdb.d/database.sql
+VOLUME /docker-entrypoint-initdb.d
+
diff --git a/docker-cloud.yml b/docker-cloud.yml
index bf0a4a7b3..8b054fe10 100644
--- a/docker-cloud.yml
+++ b/docker-cloud.yml
@@ -1,3 +1,5 @@
+sqlscript:
+    image: jekkos/opensourcepos:sqlscript
 web:
     image: jekkos/opensourcepos:master
     links:
@@ -22,5 +24,5 @@ mysql:
         - MYSQL_PASSWORD=pointofsale
     ports:
         - 3306:3306
-    volumes:
-        - /app/database/database.sql:/docker-entrypoint-initdb.d/database.sql
+    volumes_from:
+        - sqlscript
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 07fbfc4d3..3b5472ccd 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -5,6 +5,10 @@ services:
         build:
             context: .
             dockerfile: Dockerfile.test
+    sqlscript:
+        build:
+            context: database/
+            dockerfile: Dockerfile
     php:
         build:
             context: .
diff --git a/docker-compose.yml b/docker-compose.yml
index 0e5a9196e..563db5f9b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,6 +5,10 @@ volumes:
         driver: local
   
 services:
+    sqlscript:
+        build:
+            context: database/
+            dockerfile: Dockerfile
     php:
         build:
             context: .
@@ -30,5 +34,5 @@ services:
             - MYSQL_PASSWORD=pointofsale
         ports:
             - "3306:3306"
-        volumes:
-            - ./database/database.sql:/docker-entrypoint-initdb.d/database.sql
+        volumes_from:
+            - sqlscript