- Docker setup adjustments

- Docker console util

Author: babenkoivan

composer.json

@@ -41,8 +41,5 @@
                 "ScoutElastic\\ScoutElasticServiceProvider"
             ]
         }
-    },
-    "scripts": {
-        "test": "vendor/bin/phpunit -c phpunit.xml"
     }
 }

docker/console

@@ -0,0 +1,131 @@
+#!/bin/sh
+
+bg_red="\033[41m"
+bg_green="\033[42m"
+bg_black="\033[40m"
+
+txt_white="\033[0;37m"
+txt_yellow="\033[0;33m"
+txt_green="\033[0;32m"
+
+color_reset="\033[0m"
+
+error()
+{
+    echo "${txt_white}${bg_red}$@"
+}
+
+success()
+{
+    echo "${txt_white}${bg_green}$@"
+}
+
+dk_help()
+{
+    echo \
+        "${txt_yellow}Available commands:${color_reset} \n" \
+        "${txt_green}link${color_reset}     Create executable /usr/local/bin/dk\n" \
+        "${txt_green}unlink${color_reset}   Remove executable /usr/local/bin/dk\n" \
+        "${txt_green}up${color_reset}       Create and start containers\n" \
+        "${txt_green}down${color_reset}     Stop and remove containers, networks, images, and volumes\n" \
+        "${txt_green}rebuild${color_reset}  Rebuild and restart containers\n" \
+        "${txt_green}run${color_reset}      Run a command in a new container, then remove container when it exits\n" \
+        "${txt_green}exec${color_reset}     Run a command in a running container\n" \
+        "${txt_green}artisan${color_reset}  Run an artisan command\n" \
+        "${txt_green}tinker${color_reset}   Launch tinker\n" \
+        "${txt_green}tests${color_reset}    Run tests\n"
+}
+
+dk_link()
+{
+    source="`pwd`/$0"
+    target="/usr/local/bin/${1:-dk}"
+
+    if [ -f $target ]
+    then
+        error "$target already exists"
+        return
+    fi
+
+    echo \
+        "#!/bin/sh\n" \
+        "export dk_bin=$target\n" \
+        "cd `dirname $source`\n" \
+        "./`basename $source` \$@\n" \
+        > $target
+
+    chmod +x $source
+    chmod +x $target
+
+    success "$target was created"
+}
+
+dk_unlink()
+{
+    if [ -z $dk_bin ]
+    then
+        error "link not found"
+        return
+    fi
+
+    rm $dk_bin
+
+    success "$dk_bin was removed"
+}
+
+dk_up()
+{
+    docker-compose up $@
+}
+
+dk_down()
+{
+    docker-compose down $@
+}
+
+dk_rebuild()
+{
+    dk_down --volumes --rmi all
+    dk_up --build -d
+}
+
+dk_run()
+{
+    service=$1
+    shift
+
+    docker-compose run --rm $service $@
+}
+
+dk_exec()
+{
+    service=$1
+    shift
+
+    docker-compose exec $service $@
+}
+
+dk_artisan()
+{
+    dk_run php ./artisan $@
+}
+
+dk_tinker()
+{
+    dk_artisan tinker
+}
+
+dk_tests()
+{
+    dk_run php /app/driver/vendor/bin/phpunit -c /app/driver/phpunit.xml
+}
+
+command=dk_${1:-help}
+shift
+
+if [ "`type -t $command`" = "function" ]
+then
+    $command $@
+else
+    error "Command not found"
+fi

docker/docker-compose.yml

@@ -7,37 +7,46 @@ networks:
   default-net:
 
 services:
+  driver:
+    build:
+      context: ..
+      dockerfile: docker/driver/Dockerfile
+    volumes:
+      - ./..:/app/driver
+    networks:
+      - default-net
   laravel:
     build:
-      context: ./..
+      context: laravel
       args:
         version: v5.6.*
-      dockerfile: ./docker/laravel/Dockerfile
+      dockerfile: Dockerfile
     volumes:
-      - ./..:/app/scout-elasticsearch-driver
+      - ./..:/app/driver
       - laravel:/app/laravel
     networks:
       - default-net
   php:
     build:
-      context: ./php
+      context: php
       args:
         version: 7.2
-      dockerfile: ./Dockerfile
+      dockerfile: Dockerfile
     depends_on:
       - laravel
       - mysql
-      - elastic
+#      - elastic
     volumes:
+      - ./..:/app/driver
       - laravel:/app/laravel
     networks:
       - default-net
   mysql:
     build:
-      context: ./mysql
+      context: mysql
       args:
         version: 5.7
-      dockerfile: ./Dockerfile
+      dockerfile: Dockerfile
     volumes:
       - ./mysql/data:/var/lib/mysql
     environment:
@@ -47,29 +56,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/driver/Dockerfile

@@ -0,0 +1,8 @@
+FROM composer:latest
+
+WORKDIR /app/driver
+
+# Bootstrap
+COPY docker/driver/bootstrap /usr/local/bin/bootstrap
+RUN chmod 544 /usr/local/bin/bootstrap
+CMD ["bootstrap"]

docker/driver/bootstrap

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Install dependencies
+composer install --no-interaction

docker/laravel/Dockerfile

@@ -8,20 +8,20 @@ WORKDIR /app/laravel
 RUN composer create-project --no-interaction --prefer-dist laravel/laravel . $version
 
 # Setup environment
-COPY ./docker/laravel/.env .env
+COPY .env .env
 
 # Copy migrations
 RUN rm database/migrations/*
-COPY ./docker/laravel/database/migrations/* database/migrations/
+COPY database/migrations/* database/migrations/
 
 # Copy seeders
 RUN rm database/seeds/*
-COPY ./docker/laravel/database/seeds/* database/seeds/
+COPY database/seeds/* database/seeds/
 
 # Regenerate autoloader
-RUN composer dump-autoload
+RUN composer dump-autoload --no-interaction
 
 # Bootstrap
-COPY ./docker/laravel/bootstrap.sh /usr/local/bin/bootstrap
+COPY bootstrap /usr/local/bin/bootstrap
 RUN chmod 544 /usr/local/bin/bootstrap
 CMD ["bootstrap"]

docker/laravel/bootstrap

@@ -0,0 +1,8 @@
+#!/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

docker/laravel/bootstrap.sh

@@ -9,6 +9,6 @@ RUN docker-php-ext-install \
 WORKDIR /app/laravel
 
 # Bootstrap
-COPY ./bootstrap.sh /usr/local/bin/bootstrap
+COPY bootstrap /usr/local/bin/bootstrap
 RUN chmod 544 /usr/local/bin/bootstrap
 CMD ["bootstrap"]

docker/php/Dockerfile

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 # Clear application cache
 php artisan cache:clear --no-interaction