From 9e9899349f085c61532c21486f2e7f9ce8fd2a94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Tue, 1 Dec 2020 18:20:25 +0100
Subject: [PATCH] Simplify docker build, use stable PHP 8 image

---
 .github/workflows/ci.yml | 9 ++-------
 docker-compose.yml       | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6f5e8c27..efb8ad02 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,18 +15,13 @@ jobs:
 
     strategy:
       matrix:
-        php_version: ["7.4"]
-        php_target: ["php:7.4-cli"]
+        php: ["7.4", "8.0"]
         laravel: ["^6.0", "^8.0"]
-        include:
-          - php_version: "8.0"
-            php_target: "php:8.0.0RC5-cli"
-            laravel: "^8.0"
 
     steps:
     - uses: actions/checkout@v2
     - name: Start docker containers
-      run: PHP_TARGET=${{ matrix.php_target }} PHP_VERSION=${{ matrix.php_version }} docker-compose up -d
+      run: PHP_VERSION=${{ matrix.php }} docker-compose up -d
     - name: Install dependencies
       run: docker-compose exec -T test composer require --no-interaction "laravel/framework:${{ matrix.laravel }}"
     - name: Run tests
diff --git a/docker-compose.yml b/docker-compose.yml
index ffb141e8..30d87dfd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,6 @@ services:
             context: .
             args:
               PHP_VERSION: ${PHP_VERSION}
-              PHP_TARGET: ${PHP_TARGET}
         depends_on:
             mysql:
                 condition: service_healthy