From 8daeb37d168e8c457b2f54b092fae16dbcf5c6f1 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Wed, 27 May 2015 17:45:11 +0800
Subject: [PATCH] update

---
 opencart/Dockerfile         | 18 ++++++++++--------
 opencart/README.md          | 17 +++++++++++++++++
 opencart/docker-compose.yml | 15 +++++++++++++++
 3 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 opencart/docker-compose.yml

diff --git a/opencart/Dockerfile b/opencart/Dockerfile
index 8f58a14..6381900 100644
--- a/opencart/Dockerfile
+++ b/opencart/Dockerfile
@@ -8,9 +8,9 @@ MAINTAINER kev<noreply@datageek.info>
 RUN a2enmod rewrite
 
 RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libmcrypt-dev \
-        && rm -rf /var/lib/apt/lists/* \
-        && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
-        && docker-php-ext-install gd mcrypt mbstring mysqli
+    && rm -rf /var/lib/apt/lists/* \
+    && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+    && docker-php-ext-install gd mcrypt mbstring mysqli zip
 
 WORKDIR /var/www/html
 
@@ -19,9 +19,11 @@ ENV OPENCART_MD5 27f22c70eac060a304fc64311c8278d5
 ENV OPENCART_URL https://github.com/opencart/opencart/archive/${OPENCART_VER}.tar.gz
 ENV OPENCART_FILE opencart.tar.gz
 
-RUN curl -fSL ${OPENCART_URL} -o ${OPENCART_FILE} \
-        && echo "${OPENCART_MD5} ${OPENCART_FILE}" | md5sum -c \
-        && tar xzf ${OPENCART_FILE} --strip 2 '*/upload/' \
-        && rm ${OPENCART_FILE} \
-        && chown -R www-data:www-data .
+RUN curl -sSL ${OPENCART_URL} -o ${OPENCART_FILE} \
+    && echo "${OPENCART_MD5} ${OPENCART_FILE}" | md5sum -c \
+    && tar xzf ${OPENCART_FILE} --strip 2 '*/upload/' \
+    && mv config-dist.php config.php \
+    && mv admin/config-dist.php admin/config.php \
+    && rm ${OPENCART_FILE} \
+    && chown -R www-data:www-data .
 
diff --git a/opencart/README.md b/opencart/README.md
index df44c39..ee34aad 100644
--- a/opencart/README.md
+++ b/opencart/README.md
@@ -1,2 +1,19 @@
 `OpenCart` is designed feature rich, easy to use, search engine
 friendly and with a visually appealing interface.
+
+```
+opencart:
+  image: opencart
+  ports:
+    - "8000:80"
+  links:
+    - mysql
+  restart: always
+
+mysql:
+  image: mysql
+  environment:
+    - MYSQL_ROOT_PASSWORD=root
+    - MYSQL_DATABASE=opencart
+  restart: always
+```
diff --git a/opencart/docker-compose.yml b/opencart/docker-compose.yml
new file mode 100644
index 0000000..15f9a61
--- /dev/null
+++ b/opencart/docker-compose.yml
@@ -0,0 +1,15 @@
+opencart:
+  image: opencart
+  ports:
+    - "8000:80"
+  links:
+    - mysql
+  restart: always
+
+mysql:
+  image: mysql
+  environment:
+    - MYSQL_ROOT_PASSWORD=root
+    - MYSQL_DATABASE=opencart
+  restart: always
+