Moved driver initialization to php container

Author: babenkoivan

docker/docker-compose.yml

@@ -22,7 +22,6 @@ services:
         version: v5.6.*
       dockerfile: Dockerfile
     volumes:
-      - ./..:/app/driver
       - laravel:/app/laravel
     networks:
       - default-net
@@ -35,7 +34,7 @@ services:
     depends_on:
       - laravel
       - mysql
-#      - elastic
+      - elastic
     volumes:
       - ./..:/app/driver
       - laravel:/app/laravel
@@ -56,29 +55,29 @@ services:
       - default-net
     ports:
       - 13306:3306
-#  elastic:
-#    build:
-#      context: elastic
-#      args:
-#        version: 6.2.4
-#      dockerfile: Dockerfile
-#    volumes:
-#      - ./elastic/data:/usr/share/elasticsearch/data
-#    networks:
-#      - default-net
-#    ports:
-#      - 19200:9200
-#  kibana:
-#    build:
-#      context: kibana
-#      args:
-#        version: 6.2.4
-#      dockerfile: Dockerfile
-#    depends_on:
-#      - elastic
-#    environment:
-#      ELASTICSEARCH_URL: http://elastic:9200
-#    networks:
-#      - default-net
-#    ports:
-#      - 15601:5601
+  elastic:
+    build:
+      context: elastic
+      args:
+        version: 6.2.4
+      dockerfile: Dockerfile
+    volumes:
+      - ./elastic/data:/usr/share/elasticsearch/data
+    networks:
+      - default-net
+    ports:
+      - 19200:9200
+  kibana:
+    build:
+      context: kibana
+      args:
+        version: 6.2.4
+      dockerfile: Dockerfile
+    depends_on:
+      - elastic
+    environment:
+      ELASTICSEARCH_URL: http://elastic:9200
+    networks:
+      - default-net
+    ports:
+      - 15601:5601

docker/laravel/Dockerfile

@@ -20,8 +20,3 @@ COPY database/seeds/* database/seeds/
 
 # Regenerate autoloader
 RUN composer dump-autoload --no-interaction
-
-# Bootstrap
-COPY bootstrap /usr/local/bin/bootstrap
-RUN chmod 544 /usr/local/bin/bootstrap
-CMD ["bootstrap"]

docker/laravel/bootstrap

@@ -2,10 +2,21 @@ ARG version
 
 FROM php:${version}-cli
 
-# Install necessary php extensions
+# Install system libraries
+RUN apt-get update -y && apt-get install -y \
+    unzip \
+    zlib1g-dev \
+    git
+
+# Install php extensions
 RUN docker-php-ext-install \
+    zip \
     pdo_mysql
 
+# Install composer
+RUN curl -sS https://getcomposer.org/installer | \
+    php -- --install-dir=/usr/bin/ --filename=composer
+
 WORKDIR /app/laravel
 
 # Bootstrap

docker/php/Dockerfile

@@ -1,5 +1,12 @@
 #!/bin/sh
 
+# Add driver repository
+composer config --no-interaction repositories.scout-elasticsearch-driver \
+    '{"type": "path", "url": "../driver", "options": {"symlink": true}}'
+
+# Require driver package
+composer require --no-interaction --prefer-dist babenkoivan/scout-elasticsearch-driver:@dev
+
 # Clear application cache
 php artisan cache:clear --no-interaction