From 1bd9c760b65ee4bd634cd7757498a9b89f088e0f Mon Sep 17 00:00:00 2001 From: Wanderson Camargo Date: Wed, 31 Mar 2021 21:50:34 -0300 Subject: [PATCH 1/3] Use Docker Compose arguments --- docker-compose.yml | 5 ++++- docker-compose/Dockerfile | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3b70818..4030f9c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,10 @@ version: "3.8" services: romans: - build: "./docker-compose" + build: + context: "./docker-compose" + args: + PHP_VERSION: "${PHP_VERSION:-8.0}" volumes: - ".:/app" user: "${UID:-1000}:${GID:-1000}" diff --git a/docker-compose/Dockerfile b/docker-compose/Dockerfile index aaf043c..8ab7d66 100644 --- a/docker-compose/Dockerfile +++ b/docker-compose/Dockerfile @@ -1,4 +1,6 @@ -FROM php:7.4-cli-alpine +ARG PHP_VERSION + +FROM php:${PHP_VERSION}-cli-alpine ENV COMPOSER_CACHE_DIR /tmp From 232a632598bf602f2a04f115daeb42f1304baf21 Mon Sep 17 00:00:00 2001 From: Wanderson Camargo Date: Wed, 31 Mar 2021 21:51:07 -0300 Subject: [PATCH 2/3] Disable PHP Actions --- .github/workflows/test.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 884d844..72f1021 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,12 +17,17 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + - name: Prepare + run: | + echo UID=`id -u` >> $GITHUB_ENV + echo GID=`id -g` >> $GITHUB_ENV + - name: Build + run: docker-compose build + env: + PHP_VERSION: ${{ matrix.php_version }} - name: Install - uses: php-actions/composer@v5 - with: - php_version: ${{ matrix.php_version }} + run: docker-compose run romans composer install - name: Test - uses: php-actions/composer@v5 - with: - php_version: ${{ matrix.php_version }} - command: test + run: docker-compose run romans composer test + - name: Clean + run: docker-compose down From e5f4c586775800d747c2825130ac37eb90cc2872 Mon Sep 17 00:00:00 2001 From: Wanderson Camargo Date: Wed, 31 Mar 2021 21:51:15 -0300 Subject: [PATCH 3/3] Update docs --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 86d1616..4a88939 100644 --- a/README.md +++ b/README.md @@ -65,11 +65,9 @@ You can use Docker Compose to build an image and run a container to develop and test this package. ```bash -docker-compose up --detach - -docker-compose exec romans composer install - -docker-compose exec romans composer test +docker-compose build +docker-compose run romans composer install +docker-compose run romans composer test ``` ## License