From 580d278cc589e20f63d06bf6ceecf2324aea128e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gervais=20S=C3=A9bastien?= Date: Tue, 25 Feb 2020 14:53:25 +0100 Subject: [PATCH 1/3] Update .drone.yml --- .drone.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 5600a9f..07a57ff 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,5 +1,16 @@ matrix: include: + - PHP_VERSION: 7.4 + TARGET: httpd-php + - PHP_VERSION: 7.4 + TARGET: httpd-php-ci + - PHP_VERSION: 7.4 + TARGET: httpd-php-dev + - PHP_VERSION: 7.4 + TARGET: httpd-php-full + - PHP_VERSION: 7.4 + TARGET: httpd-php-oci + OCI8_VERSION: 2.2.0 - PHP_VERSION: 7.3 TARGET: httpd-php - PHP_VERSION: 7.3 @@ -103,4 +114,4 @@ pipeline: when: event: tag matrix: - PHP_VERSION: ${DRONE_TAG%.*} \ No newline at end of file + PHP_VERSION: ${DRONE_TAG%.*} From 057ec87b0e9769d063d0f14925f342d50edc1630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gervais=20S=C3=A9bastien?= Date: Tue, 25 Feb 2020 14:56:34 +0100 Subject: [PATCH 2/3] Update .drone.yml --- .drone.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.drone.yml b/.drone.yml index 07a57ff..d60b306 100644 --- a/.drone.yml +++ b/.drone.yml @@ -70,6 +70,21 @@ matrix: pipeline: + # Build and push release + build-and-push-branch: + image: plugins/docker + repo: fpfis/${TARGET} + tags: ${PHP_VERSION} + secrets: [ DOCKER_USERNAME, DOCKER_PASSWORD ] + target: ${TARGET} + dry_run: true + build_args: + - php_version=${PHP_VERSION} + - oci8_version=${OCI8_VERSION} + when: + event: pull_request + branch: develop + # Build and push release build-and-push-branch: image: plugins/docker From 5bf4f77e9106ed943ef84badce5221d747410d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gervais=20S=C3=A9bastien?= Date: Tue, 25 Feb 2020 16:02:03 +0100 Subject: [PATCH 3/3] Update .drone.yml --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index d60b306..b1cf5e0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -70,8 +70,8 @@ matrix: pipeline: - # Build and push release - build-and-push-branch: + # Build for test (dry-run) + build-for-test-branch: image: plugins/docker repo: fpfis/${TARGET} tags: ${PHP_VERSION}