docker相关文件放docker目录

Apollolan · May 15, 2016 · 92cfa1e · 92cfa1e
1 parent e575c30
commit 92cfa1e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -7,9 +7,9 @@ RUN docker-php-ext-install bcmath intl mbstring mcrypt mysqli opcache pdo_mysql
 RUN a2enmod rewrite
 
 COPY ./ /opt/walle-web
-COPY php.ini /usr/local/etc/php/conf.d/walle-web.ini
-COPY apache2.conf /etc/apache2/apache2.conf
-COPY entrypoint.sh /entrypoint.sh
+COPY docker/php.ini /usr/local/etc/php/conf.d/walle-web.ini
+COPY docker/apache2.conf /etc/apache2/apache2.conf
+COPY docker/entrypoint.sh /entrypoint.sh
 
 WORKDIR /opt/walle-web
 RUN curl -sS https://getcomposer.org/installer | php \

diff --git a/apache2.conf → docker/apache2.conf b/apache2.conf → docker/apache2.conf
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -e
+
+/opt/walle-web/yii walle/setup --interactive=0
+
+exec $@
diff --git a/php.ini → docker/php.ini b/php.ini → docker/php.ini
diff --git a/entrypoint.sh b/entrypoint.sh