FrancescoUK
d7df291b9a
Merge branch develop/2.4 into master
2016-03-08 19:14:36 +00:00
jekkos
8a5177f14c
Fix base url for testcases ( #305 )
...
Fix legacy ubuntu repository urls (#284 )
2016-03-08 18:16:31 +00:00
jekkos
35d53e2fae
Fix base url for testcases ( #305 )
...
Fix legacy ubuntu repository urls (#284 )
2016-02-03 11:09:45 +01:00
jekkos
fa3d77299e
Use curl to wait for apache start ( #305 )
2016-02-03 11:04:09 +01:00
jekkos
48a16d65e1
Fix base url for testcases ( #305 )
...
Fix legacy ubuntu repository urls (#284 )
2016-02-03 10:49:20 +01:00
jekkos
89f126ab04
Use curl to wait for apache start ( #305 )
2016-01-31 16:03:19 +01:00
jekkos
67d9ca1e41
Merge branch 'master' into develop/2.4
...
Conflicts:
Dockerfile
2016-01-29 17:34:53 +01:00
jekkos
8f9d80a809
Wait for container before running integration tests ( #305 )
...
Add integratoin test for quantity units (#305 )
2016-01-29 17:24:28 +01:00
jekkos
85c6da4346
Add integration test for making receiving ( #305 )
...
Update docker scripts to work with data volumes (#284 )
2016-01-27 20:11:21 +01:00
jekkos
0a159c803f
Add testcase for creating new item
...
Optimise CI setup
2016-01-25 21:14:48 +01:00
jekkos
22a7231d8f
Run docker container in background + launch tests once ready
2016-01-25 19:16:13 +01:00
jekkos
2520970698
Fix comment for autogenerated sql files ( #301 , #258 )
2016-01-25 08:42:15 +01:00
jekkos
1148ef1595
Install grunt-cli in docker container ( #284 )
2016-01-22 14:43:53 +01:00
jekkos
cfbb700f0c
Add symlink for node in Dockerfile
2016-01-22 13:10:23 +01:00
jekkos
a3d3cfad61
Use Dockerfile in travis-ci setup ( #284 )
...
Set version in package.json
2016-01-22 08:18:40 +01:00
jekkos
192955b33d
Fix receipt barcode generation for docker (add php5-gd lib to Dockerfile) ( #284 )
...
Make setup scripts with CI3
2016-01-21 18:30:06 +01:00
jekkos
195c8a0601
Make docker work with 2.4 branch
2016-01-21 16:23:54 +01:00
jekkos
9048d68baf
Make docker work wig
2016-01-21 16:23:17 +01:00
jekkos
2b70762b7a
Use ubuntu trusty for Docker container + add startup scripts ( #284 )
...
Add Grunt concatenate for sql scripts (migrate + db init) (#289 )
2016-01-20 18:47:44 +01:00
jekkos
a1ad99cc0d
Add Dockerfile. Ospos is now containerized. Pull image from
...
docker build -t me/ospos git://github.com/jekkos/opensourcepos.git
then run
docker run -it me/opensourcepos
And head to port 80 to login to a new ospos install.
2016-01-13 08:45:10 +01:00
FrancescoUK