From 3934025d679fbeba0c33c211fb317bbf21a73549 Mon Sep 17 00:00:00 2001
From: Mohit Panjwani <mohit.panjvani@gmail.com>
Date: Thu, 2 Dec 2021 17:49:10 +0530
Subject: [PATCH] fix docker issue

---
 Dockerfile         | 63 +++++++++++++++++++++++++---------------------
 docker-compose.yml |  1 -
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 53c45f3a..4f9658e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,42 +3,47 @@ FROM php:7.4-fpm-alpine
 WORKDIR /var/www
 
 RUN apk add --no-cache \
-            $PHPIZE_DEPS \
-            freetype-dev \
-            git \
-            zip \
-            libzip-dev \
-            php7-bcmath \
-            curl \
-            unzip \
-            libjpeg-turbo-dev \
-            libpng-dev \
-            libxml2-dev \
-            mariadb-client \
-            sqlite \
-            php7-json \
-            php7-openssl \
-            php7-pdo \
-            php7-pdo_mysql \
-            php7-session \
-            php7-simplexml \
-            php7-tokenizer \
-            php7-xml \
-            imagemagick \
-            imagemagick-libs \
-            imagemagick-dev \
-            php7-imagick \
-            php7-pcntl \
-            --repository http://dl-cdn.alpinelinux.org/alpine/v3.13/community/ gnu-libiconv=1.15-r3
+    $PHPIZE_DEPS \
+    freetype-dev \
+    git \
+    zip \
+    libzip-dev \
+    php7-bcmath \
+    curl \
+    unzip \
+    libjpeg-turbo-dev \
+    libpng-dev \
+    libxml2-dev \
+    mariadb-client \
+    sqlite \
+    php7-json \
+    php7-openssl \
+    php7-pdo \
+    php7-pdo_mysql \
+    php7-session \
+    php7-simplexml \
+    php7-tokenizer \
+    php7-xml \
+    imagemagick \
+    imagemagick-libs \
+    imagemagick-dev \
+    php7-imagick \
+    php7-pcntl \
+    --repository http://dl-cdn.alpinelinux.org/alpine/v3.13/community/ gnu-libiconv=1.15-r3
 
 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
 
 RUN printf "\n" | pecl install \
-		imagick && \
-		docker-php-ext-enable --ini-name 20-imagick.ini imagick
+    imagick && \
+    docker-php-ext-enable --ini-name 20-imagick.ini imagick
 
 RUN docker-php-ext-configure zip
 RUN docker-php-ext-install zip
 RUN docker-php-ext-install iconv pdo pdo_mysql bcmath pcntl exif
 RUN docker-php-ext-configure gd --with-jpeg --with-freetype
 RUN docker-php-ext-install gd
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+    && php composer-setup.php \
+    && php -r "unlink('composer-setup.php');" \
+    && mv composer.phar /usr/bin/composer
diff --git a/docker-compose.yml b/docker-compose.yml
index a3e8cf5e..c7c4ad9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -50,7 +50,6 @@ services:
     build:
       context: ./
       dockerfile: ./docker-compose/cron.dockerfile
-    container_name: cron
     volumes:
       - ./:/var/www
     networks: