Merged in APITOCART-16375-demo-fix-docker-composer.yml (pull request #35)

APITOCART-16375 demo fix docker composer.yml [MASTER]

Approved-by: Igor Liubarskyi
Approved-by: Oleg Syvak

Author: Taras Kubiv

Dockerfile

@@ -1,19 +1,36 @@
 FROM php:7.4-fpm-alpine
 
-ADD php/php.ini /usr/local/etc/php/conf.d/40-custom.ini
-
 WORKDIR /var/www/html
 
 COPY src/.env.example /var/www/html/.env
 
 RUN apk add --update libzip-dev curl-dev &&\
-    docker-php-ext-install curl && \
+    docker-php-ext-install curl
+
+RUN docker-php-ext-install pdo pdo_mysql
+
+# xdebug with PHPSHTORM
+ENV XDEBUG_VERSION=2.9.2
+RUN apk --no-cache add --virtual .build-deps \
+    g++ \
+    autoconf \
+    make && \
+    pecl install xdebug-${XDEBUG_VERSION} && \
+    docker-php-ext-enable xdebug && \
+    apk del .build-deps && \
+    rm -r /tmp/pear/* && \
     apk del gcc g++ &&\
     rm -rf /var/cache/apk/*
 
-RUN docker-php-ext-install pdo pdo_mysql
+# Change TimeZone
+RUN apk add --update tzdata
+ENV TZ=Europe/Kiev
+
+ADD var/etc/php /usr/local/etc/php
 
+#Install composer
+RUN curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer
 
-RUN usermod -u 1000 www-data; \
-    chown -R www-data:www-data /var/www/html
+RUN apk --no-cache add shadow && usermod -u 1000 www-data; \
+    chown -R www-data:www-data /var/www/html && chmod 777 -R /var/log
 

docker-compose.yml

@@ -9,9 +9,12 @@ services:
     container_name: nginx
     ports:
       - "8080:80"
+      - "8443:443"
     volumes:
       - ./src:/var/www/html
-      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
+      - ./var/etc/nginx/default.conf:/etc/nginx/conf.d/default.conf
+      - ./var/etc/nginx/ssl:/etc/ssl
+      - ./var/logs/nginx:/var/log/nginx
     depends_on:
       - php
       - mysql
@@ -34,6 +37,7 @@ services:
       SERVICE_NAME: mysql
     volumes:
       - dbdata:/var/lib/mysql
+      - ./var/logs/mysql:/var/log/mysql
     networks:
       - laravel
   php:
@@ -43,20 +47,7 @@ services:
     container_name: php
     volumes:
       - ./src:/var/www/html
-    ports:
-      - "9000:9000"
-    networks:
-      - laravel
-
-  composer:
-    image: composer:latest
-    container_name: composer
-    user: ${uid}
-    volumes:
-      - ./src:/var/www/html
-    working_dir: /var/www/html
-    depends_on:
-      - php
+      - ./var/logs:/var/log
     networks:
       - laravel
 

run_me.bat

@@ -28,4 +28,4 @@ docker-compose run app php artisan migrate
 
 docker-compose run app php artisan db:seed
 
-start "" http://localhost:8080
+start "" https://demo-module.api2cart.local.com:8443

run_me.sh

@@ -44,7 +44,7 @@ docker-compose up -d
 if [ $? -eq 0 ];
 then
     echo "Looks all ok, update related dependencies..."
-    docker-compose run --rm composer update
+    docker-compose run app composer update
     docker-compose run app php artisan migrate
     docker-compose run app php artisan db:seed
 else
@@ -53,7 +53,7 @@ else
 fi
 
 if ! [ -x "$(command -v xdg-open)" ]; then
-    open http://localhost:8080
+    open https://demo-module.api2cart.local.com:8443
     exit 0
 fi
-xdg-open http://localhost:8080
+xdg-open https://demo-module.api2cart.local.com:8443

src/.env.example

@@ -2,7 +2,7 @@ APP_NAME="Api2Cart Demo"
 APP_ENV=local
 APP_KEY=base64:+oaKbnRJG4izevBAqf0ctXhcV0A0J5E/2Os5+XgA5ZY=
 APP_DEBUG=false
-APP_URL=http://localhost
+APP_URL=https://demo-module.api2cart.local.com
 APP_LOCALE=en
 APP_FALLBACK_LOCALE=en
 APP_LOCALE_PHP=en_US
@@ -51,7 +51,7 @@ PUSHER_APP_CLUSTER=mt1
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
 
-#API2CART_URL=http://api.api2cart.local
+API2CART_URL=https://api.api2cart.com/v1.1
 
 UID=1000
 

src/app/Services/Api2Cart.php

@@ -43,6 +43,7 @@ public function __construct($isTest=false)
         $this->isTest = $isTest;
 
         $this->config = new ApiClient\Configuration();
+        $this->config->setHost(env('API2CART_URL', 'https://api.api2cart.com/v1.1'));
 
         $this->account  = new ApiClient\Api\AccountApi(null, $this->config);
         $this->cart     = new ApiClient\Api\CartApi(null, $this->config );

src/app/helpers.php

@@ -3,29 +3,38 @@
  * Here is helper functions
  */
 
-function array_diff_assoc_recursive($array1, $array2) {
-    $difference=array();
-    foreach($array1 as $key => $value) {
-        if( is_array($value) ) {
-            if( !isset($array2[$key]) || !is_array($array2[$key]) ) {
+function array_diff_assoc_recursive($array1, $array2)
+{
+    $difference = array();
+    foreach ($array1 as $key => $value) {
+        if (is_array($value)) {
+            if (!isset($array2[$key]) || !is_array($array2[$key])) {
                 $difference[$key] = $value;
             } else {
                 $new_diff = array_diff_assoc_recursive($value, $array2[$key]);
-                if( !empty($new_diff) )
+                if (!empty($new_diff))
                     $difference[$key] = $new_diff;
             }
-        } else if( !array_key_exists($key,$array2) || $array2[$key] != $value ) {
+        } else if (!array_key_exists($key, $array2) || $array2[$key] != $value) {
             $difference[$key] = $value;
         }
     }
     return $difference;
 }
 
-if ( !function_exists('str_finish')){
+if (!function_exists('str_finish')) {
 
     function str_finish($value, $cap)
     {
         return \Illuminate\Support\Str::finish($value, $cap);
     }
 
+}
+
+function paginate($items, $perPage = 15, $page = null, $options = [])
+{
+    $page = $page ?: (\Illuminate\Pagination\Paginator::resolveCurrentPage() ?: 1);
+    $items = $items instanceof \Illuminate\Support\Collection ? $items : \Illuminate\Support\Collection::make($items);
+
+    return new \Illuminate\Pagination\LengthAwarePaginator($items->forPage($page, $perPage), $items->count(), $perPage, $page, $options);
 }

src/composer.json

@@ -14,7 +14,7 @@
         "fideloper/proxy": "^4.2",
         "fruitcake/laravel-cors": "^1.0",
         "guzzlehttp/guzzle": "^6.3",
-        "laravel/framework": "^7.0",
+        "laravel/framework": "7.21.0",
         "laravel/tinker": "^2.0",
         "laravel/ui": "^2.0",
         "laravelcollective/html": "^6.1"