add docker

docker/docker-compose.yml → docker-compose.yml

@@ -6,8 +6,8 @@ services:
     container_name: lnmp_mariadb
     restart: always
     volumes:
-      - ./mysql/initdb/:/docker-entrypoint-initdb.d
-      - ./mysql/data/:/var/lib/mysql
+      - ./docker/mysql/initdb/:/docker-entrypoint-initdb.d
+      - ./docker/mysql/data/:/var/lib/mysql
     environment:
       - MYSQL_ROOT_PASSWORD=123123123
       - MYSQL_DATABASE=app
@@ -17,19 +17,21 @@ services:
       - 33306:3306
 
   php:
-    build: ./php-fpm
+    build: ./docker/php-fpm
     container_name: lnmp_php-fpm
     restart: always
     expose:
       - "9000"
+    volumes:
+     - .:/var/www/html/
 
   nginx:
-    build: ./nginx
+    build: ./docker/nginx
     container_name: lnmp_nginx
     restart: always
     volumes:
-      - ./nginx/conf/nginx.conf:/etc/nginx/conf/nginx.conf:ro
-      - ./nginx/conf.d:/etc/nginx/conf.d:ro
+      - ./docker/nginx/conf/nginx.conf:/etc/nginx/conf/nginx.conf:ro
+      - ./docker/nginx/conf.d:/etc/nginx/conf.d:ro
     links:
       - db:db
     volumes_from:
@@ -38,7 +40,7 @@ services:
       - 380:80
       
   pma:
-      image: ./pma
+      build: ./docker/pma
       container_name: lnmp-pma
       restart: always
       ports:

docker/nginx/conf.d/pma.conf

@@ -1,9 +0,0 @@
-
-#PhpMyAdmin
-server {
-    listen 80;
-    server_name app-pma.dev;
-    location / {
-        proxy_pass http://app-pma.dev:8000;
-    }
-}

docker/php-fpm/Dockerfile

@@ -16,16 +16,6 @@ RUN php -r "readfile('https://getcomposer.org/installer');" | php -- --install-d
 && apk del tzdata \
 && rm -rf /var/cache/apk/*
 
-#dzzoffice
-
-WORKDIR "/tmp"
-
-RUN curl -kL https://github.com/zyx0814/dzzoffice/archive/2.0beta.zip -o dzzoffice.zip && \
-    unzip dzzoffice.zip && \
-    mv /tmp/dzzoffice-2.0beta/* /var/www/html && \
-    chmod -R 777 /var/www/html/data/ /var/www/html/config/ && \
-    rm -fr /tmp/dzz*
-	
 WORKDIR "/var/www/html"
 	
 EXPOSE 9000