From 165907d14447c5894415e7f39064af4f067727fe Mon Sep 17 00:00:00 2001
From: Mohit Panjwani <mohit.panjvani@gmail.com>
Date: Wed, 27 May 2020 16:01:37 +0530
Subject: [PATCH] fix docker errors

---
 Dockerfile              | 11 +++++------
 composer.json           | 13 ++-----------
 docker-compose.yml      |  1 -
 docker-compose/setup.sh |  8 ++++----
 4 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ae887edc..0862fdc1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,11 +13,15 @@ RUN apt-get update && apt-get install -y \
     libxml2-dev \
     zip \
     unzip \ 
-    libzip-dev
+    libzip-dev \ 
+    libmagickwand-dev
 
 # Clear cache
 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 
+RUN pecl install imagick \ 
+    && docker-php-ext-enable imagick
+
 # Install PHP extensions
 RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl bcmath gd 
 
@@ -33,8 +37,3 @@ RUN mkdir -p /home/$user/.composer && \
 WORKDIR /var/www
 
 USER $user
-
-# COPY ./docker-compose/setup.sh /tmp
-# RUN ln -s /usr/local/bin/setup.sh
-
-# ENTRYPOINT ["/tmp/setup.sh"]
diff --git a/composer.json b/composer.json
index 900a1f4f..f5e52922 100644
--- a/composer.json
+++ b/composer.json
@@ -54,20 +54,11 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "scripts": {
-        "initial-setup": [
-            "test -f .env || (cp .env.example .env; php artisan key:generate 2>/dev/null; exit 0)"
-        ],
-        "pre-install-cmd": [
-            "@initial-setup"
-        ],
-        "pre-update-cmd": [
-            "@initial-setup"
-        ],
         "post-root-package-install": [
-            "@initial-setup"
+            "php -r \"file_exists('.env') || copy('.env.example', '.env');\""
         ],
         "post-create-project-cmd": [
-            "@initial-setup"
+            "php artisan key:generate --ansi"
         ],
         "post-autoload-dump": [
             "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
diff --git a/docker-compose.yml b/docker-compose.yml
index 52bc0eb8..4beb1ea4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,6 @@ services:
       context: ./
       dockerfile: Dockerfile
     image: crater-php
-    container_name: crater-app
     restart: unless-stopped
     working_dir: /var/www/
     volumes:
diff --git a/docker-compose/setup.sh b/docker-compose/setup.sh
index 120b3e5c..8733a1c0 100755
--- a/docker-compose/setup.sh
+++ b/docker-compose/setup.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-cd /var/www 
+docker-compose exec app composer install --no-interaction --prefer-dist --optimize-autoloader
 
-php artisan storage:link || true
-php artisan key:generate
-php artisan passport:keys || true
\ No newline at end of file
+docker-compose exec app php artisan storage:link || true
+docker-compose exec app php artisan key:generate
+docker-compose exec app php artisan passport:keys || true
\ No newline at end of file