From 58fdcc3430fe8c88978e278ece5ac316d35749c6 Mon Sep 17 00:00:00 2001
From: Dominik Liebler <liebler.dominik@gmail.com>
Date: Tue, 1 Sep 2020 08:13:04 +0200
Subject: [PATCH] use Docker Compose in Actions

---
 .github/workflows/designpatternsphp.yml | 38 ++-----------------------
 Dockerfile                              |  6 ++--
 2 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/designpatternsphp.yml b/.github/workflows/designpatternsphp.yml
index 6720d25..23a7896 100644
--- a/.github/workflows/designpatternsphp.yml
+++ b/.github/workflows/designpatternsphp.yml
@@ -7,39 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: shivammathur/setup-php@v1
-      with:
-        php-version: '7.4'  
-        extensions: mbstring  
-        coverage: xdebug
-          
-    - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
-    - name: Get composer cache directory
-      id: composer-cache
-      run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-    - name: Cache composer dependencies
-      uses: actions/cache@v1
-      with:
-        path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-        restore-keys: ${{ runner.os }}-composer-
-
-    - name: Validate composer.json and composer.lock
-      run: composer validate
-
-    - name: Install dependencies
-      run: composer install --prefer-dist --no-progress --no-suggest --no-interaction
-
-    - name: phpunit
-      run: vendor/bin/phpunit
-    
-    - name: phpcs
-      run: vendor/bin/phpcs .
-    
-    - name: psalm
-      run: vendor/bin/psalm --show-info=false
-      
-    - name: check readme refs
-      run: ./check-refs-readmes
+      - name: build the stack
+        run: docker-compose build
diff --git a/Dockerfile b/Dockerfile
index e319867..3919c12 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,10 @@ FROM composer AS composer
 WORKDIR /app
 ADD . /app
 RUN composer install \
-    && ./vendor/bin/phpcs . \
-    && ./vendor/bin/phpunit
+    && ./vendor/bin/phpcs --ignore=_build . \
+    && ./vendor/bin/phpunit \
+    && ./vendor/bin/psalm --show-info=false \
+    && ./check-refs-readmes
 
 FROM python AS sphinx_build
 WORKDIR /app