Skip to content

Commit

Permalink
Documentation fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
tuutti committed Dec 10, 2024
1 parent 0231d5c commit 43a4ff3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 29 deletions.
28 changes: 7 additions & 21 deletions openshift/drupal/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 #
Expand Down
11 changes: 3 additions & 8 deletions openshift/drupal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 43a4ff3

Please sign in to comment.