From facc25eb74ce75d7edc83f8175c3061cb290572c Mon Sep 17 00:00:00 2001 From: jekkos Date: Sat, 11 Jun 2016 20:29:24 +0200 Subject: [PATCH] Set travis docker version to 1.10.3 (#616) Fix typo in README.md --- .travis.yml | 2 +- README.md | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index bab6494c1..92606f1cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ services: env: global: - - DOCKER_VERSION=1.7.1 # Install Docker version 1.7.1 + - DOCKER_VERSION=1.10.3 # Install Docker version 1.10.3 - DOCKER_COMPOSE_VERSION=1.7.1 - DOCKER_VERSION=get.docker.com # Install Docker using get.docker.com (may break) diff --git a/README.md b/README.md index e78907c32..45c5ffd6e 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ From now on ospos can be deployed using Docker on Linux, Mac or Windows. This se To build and run the image, issue following commands in a terminal with docker installed docker-compose build - docker-commpose up + docker-compose up diff --git a/docker-compose.yml b/docker-compose.yml index 467f5c57b..cfe548e92 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -23,7 +23,7 @@ services: - MYSQL_HOST_NAME=mysql mysql: - image: mysql:5.7 + image: mysql:5.6 environment: - MYSQL_ROOT_PASSWORD=pointofsale - MYSQL_DATABASE=ospos