Merge pull request #131 from designmynight/laravel_9_support

adjusting dependendices

Dockerfile.composer

@@ -1,14 +1,11 @@
-FROM designmynight/php7.1-cli-mongo
+FROM 607756570330.dkr.ecr.eu-west-1.amazonaws.com/dmn-php:php80-ac819d7
 
 WORKDIR /opt
 
-RUN apk add --no-cache libpng libpng-dev && docker-php-ext-install gd && apk del libpng-dev
+RUN apk add --update --no-cache libpng libpng-dev && apk del libpng-dev
 
-RUN docker-php-ext-install pcntl
-
-COPY --from=composer:1.6 /usr/bin/composer /usr/bin/composer
-
-RUN /usr/bin/composer global require hirak/prestissimo
+RUN apk add php8-gd php8-pcntl
 
 COPY composer.json /opt
 COPY composer.lock /opt
+RUN composer update

composer.json

@@ -11,13 +11,13 @@
     ],
     "license" : "MIT",
     "require": {
-        "php": "^7.1 || ^8.0",
+        "php": "^8.0",
         "ext-json": "*",
-        "elasticsearch/elasticsearch": "^7.0",
-        "laravel/framework": "^5.8 || ^6.0 || >=7.0"
+        "elasticsearch/elasticsearch": "^7.17",
+        "laravel/framework": "^9.0"
     },
     "require-dev": {
-    "phpunit/phpunit": "^7.1",
+    "phpunit/phpunit": "^9.5.19",
         "mockery/mockery": "^1.1"
     },
     "autoload": {

docker-compose.yml

@@ -1,13 +1,17 @@
 version: '3'
 services:
   unit-tests:
-    image: designmynight/php7.1-cli-mongo
-    command: phpdbg -qrr ./vendor/bin/phpunit
+    container_name: 'laravel-elasticsearch'
+    build:
+      context: .
+      dockerfile: Dockerfile.composer
+#    command: phpdbg -qrr ./vendor/bin/phpunit
     volumes:
       - .:/opt
     working_dir: /opt
 
   composer:
+    container_name: 'laravel-elasticsearch-composer'
     build:
       context: .
       dockerfile: Dockerfile.composer