From 43a4ff32a3701867f24e20e6d7757ad837d8278c Mon Sep 17 00:00:00 2001 From: tuutti Date: Tue, 10 Dec 2024 14:11:46 +0200 Subject: [PATCH] Documentation fixes --- openshift/drupal/Makefile | 28 +++++++--------------------- openshift/drupal/README.md | 11 +++-------- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/openshift/drupal/Makefile b/openshift/drupal/Makefile index dfb65bb..67dd188 100644 --- a/openshift/drupal/Makefile +++ b/openshift/drupal/Makefile @@ -9,9 +9,6 @@ help: ########### # php-dev # ########### -PHONY += build-php-dev -build-php-dev: build-php83-dev build-php84-dev - PHONY += push-php-dev push-php-dev: push-php83-dev push-php84-dev @@ -27,38 +24,27 @@ test-php: test-php83 test-php84 PHONY += push-php push-php: push-php83 push-php84 -PHONY += build-php -build-php: build-php83 build-php84 - ########### # 8.3-dev # ########### -PHONY += build-php83-dev -build-php83-dev: - $(call build_image,php83-dev) - PHONY += test-php83-dev -test-php83-dev: build-php83-dev - $(call run_tests,8.3-dev) +test-php83-dev: + $(call run_tests,php83-dev) PHONY += push-php83-dev -push-php83-dev: test-php83-dev - docker push $(REPOSITORY):8.3-dev +push-php83-dev: + $(call build_image,php83-dev) ####### # 8.3 # ####### -PHONY += build-php83 -build-php83: - $(call build_image,php83) - PHONY += test-php83 -test-php83: build-php83 - $(call run_tests,8.3) +test-php83: + $(call run_tests,php83) PHONY += push-php83 push-php83: test-php83 - docker push $(REPOSITORY):8.3 + $(call build_image,php83) ########### # 8.4-dev # diff --git a/openshift/drupal/README.md b/openshift/drupal/README.md index 060c2f8..bef5230 100644 --- a/openshift/drupal/README.md +++ b/openshift/drupal/README.md @@ -20,15 +20,10 @@ Testing environment uses `*-dev` images by default, and it's highly recommended To build a specific image, call: -- `8.4-dev` tag: `make build-php84-dev` -- `8.4` tag: `make build-php84` +- `8.4-dev` tag: `make push-php84-dev` +- `8.4` tag: `make push-php84` -To run built image locally: - -- `8.4-dev` tag: `make run-php84-dev` -- `8.4` tag: `make run-php84` - -You can also build all tags at once: `make build-php-dev` (builds all `*-dev` tags) or `make build-php` (builds stable tags). +You can also build all tags at once: `make push-php-dev` (builds all `*-dev` tags) or `make push-php` (builds stable tags). ### Testing