Skip to content

Commit 873f351

Browse files
csandanovcsandanov
committed
Add Drupal CMS, drop Drupal 7 #576 
1 parent a1db7a7 commit 873f351

17 files changed

+273
-189
lines changed

‎.env‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,14 @@ MARIADB_TAG=11.4-3.30.2
2323
#MARIADB_TAG=10.6-3.30.2
2424
#MARIADB_TAG=10.5-3.30.2
2525

26+
### --- DRUPAL CMS ----
27+
28+
DRUPAL_CMS_TAG=1-0.1.0
29+
2630
### --- VANILLA DRUPAL ----
2731

2832
DRUPAL_TAG=11-4.80.6
2933
#DRUPAL_TAG=10-4.80.6
30-
#DRUPAL_TAG=7-4.80.6
3134

3235
### --- PHP ----
3336

@@ -52,22 +55,10 @@ NGINX_TAG=1.27-5.39.13
5255

5356
NGINX_VHOST_PRESET=drupal11
5457
#NGINX_VHOST_PRESET=drupal10
55-
#NGINX_VHOST_PRESET=drupal7
5658

5759
### --- SOLR ---
5860

5961
SOLR_TAG=8-4.18.2
60-
#SOLR_TAG=7-4.18.2
61-
#SOLR_TAG=6-4.18.2
62-
#SOLR_TAG=5-4.18.2
63-
64-
SOLR_CONFIG_SET="search_api_solr_4.1.6"
65-
#SOLR_CONFIG_SET="search_api_solr_4.0.1"
66-
#SOLR_CONFIG_SET="search_api_solr_8.x-3.9"
67-
#SOLR_CONFIG_SET="search_api_solr_8.x-3.2"
68-
#SOLR_CONFIG_SET="search_api_solr_8.x-2.7"
69-
#SOLR_CONFIG_SET="search_api_solr_8.x-1.2"
70-
#SOLR_CONFIG_SET="search_api_solr_7.x-1.14"
7162

7263
### --- ELASTICSEARCH ---
7364

‎.github/workflows/workflow.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,9 @@ jobs:
1414
test:
1515
strategy:
1616
matrix:
17-
# drupal_ver: [ 11,10,7 ]
18-
drupal_ver: [ 11,10, ]
17+
drupal_ver: [ 11,10 ]
1918
php_ver: [ '8.4','8.3','8.2','8.1' ]
2019
exclude:
21-
# - drupal_ver: 7
22-
# php_ver: '8.4'
23-
# - drupal_ver: 7
24-
# php_ver: '8.3'
2520
- drupal_ver: 11
2621
php_ver: '8.2'
2722
- drupal_ver: 11
@@ -34,6 +29,12 @@ jobs:
3429
DRUPAL_VER: ${{ matrix.drupal_ver }}
3530
PHP_VER: ${{ matrix.php_ver }}
3631
run: make test
32+
test-cms:
33+
runs-on: ubuntu-latest
34+
steps:
35+
- uses: actions/checkout@v4
36+
- name: test
37+
run: make test-cms
3738
release:
3839
runs-on: ubuntu-latest
3940
if: startsWith(github.ref, 'refs/tags/')

‎Makefile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
include docker.mk
22

3-
.PHONY: test
4-
53
DRUPAL_VER ?= 11
64
PHP_VER ?= 8.4
75

86
test:
97
cd ./tests/$(DRUPAL_VER) && PHP_VER=$(PHP_VER) ./run.sh
8+
.PHONY: test
9+
10+
test-cms:
11+
cd ./tests/cms && ./run.sh
12+
.PHONY: test-cms

‎README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ The Drupal stack consist of the following containers:
1919
|-----------------|-------------------------|------------------------------|---------------|--------------------|
2020
| [Nginx] | 1.27, 1.26 | [wodby/nginx] | ✓ | ✓ |
2121
| [Apache] | 2.4 | [wodby/apache] | ✓ | |
22-
| [Drupal] | 11, 10, 7 | [wodby/drupal] | ✓ | ✓ |
22+
| Drupal CMS | 1 | [wodby/drupal-cms] | ✓ | ✓ |
23+
| Vanilla Drupal | 11, 10 | [wodby/drupal] | ✓ | |
2324
| [PHP] | 8.4, 8.3, 8.2, 8.1 | [wodby/drupal-php] | ✓ | |
2425
| Crond | | [wodby/drupal-php] | ✓ | ✓ |
2526
| [MariaDB] | 11.4, 10.11, 10.6, 10.5 | [wodby/mariadb] | ✓ | ✓ |
@@ -28,7 +29,7 @@ The Drupal stack consist of the following containers:
2829
| [Memcached] | 1 | [wodby/memcached] | | |
2930
| [Varnish] | 6.0 | [wodby/varnish] | ✓ | |
3031
| [Node.js] | 22, 20, 18 | [wodby/node] | | |
31-
| [Solr] | 8, 7, 6, 5 | [wodby/solr] | | |
32+
| [Solr] | 8 | [wodby/solr] | | |
3233
| Zookeeper | 3.8 | [zookeeper] | ✓ | |
3334
| [Elasticsearch] | 7 | [wodby/elasticsearch] | | |
3435
| [Kibana] | 7 | [wodby/kibana] | | |
@@ -79,7 +80,8 @@ Docker4Drupal is a project designed to help you spin up local environment with D
7980
This project is licensed under the MIT open source license.
8081

8182
[Apache]: https://wodby.com/docs/stacks/drupal/containers#apache
82-
[Drupal]: https://wodby.com/docs/stacks/drupal/containers#php
83+
[Drupal CMS]: https://wodby.com/docs/stacks/drupal/containers#php
84+
[Vanilla Drupal]: https://wodby.com/docs/stacks/drupal/containers#php
8385
[Elasticsearch]: https://wodby.com/docs/stacks/elasticsearch
8486
[Kibana]: https://wodby.com/docs/stacks/elasticsearch
8587
[MariaDB]: https://wodby.com/docs/stacks/drupal/containers#mariadb
@@ -106,6 +108,7 @@ This project is licensed under the MIT open source license.
106108
[wodby/apache]: https://github.com/wodby/apache
107109
[wodby/drupal-php]: https://github.com/wodby/drupal-php
108110
[wodby/drupal]: https://github.com/wodby/drupal
111+
[wodby/drupal-cms]: https://github.com/wodby/drupal-cms
109112
[wodby/elasticsearch]: https://github.com/wodby/elasticsearch
110113
[wodby/kibana]: https://github.com/wodby/kibana
111114
[wodby/mariadb]: https://github.com/wodby/mariadb

‎compose.override.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
services:
22
php:
3-
image: wodby/drupal:$DRUPAL_TAG
3+
image: wodby/drupal-cms:$DRUPAL_CMS_TAG
4+
# image: wodby/drupal:$DRUPAL_TAG
45
environment:
56
PHP_FPM_CLEAR_ENV: "no"
67
volumes:
7-
- codebase:/var/www/html
8+
- codebase:/var/www/html
89

910
crond:
10-
image: wodby/drupal:$DRUPAL_TAG
11+
image: wodby/drupal-cms:$DRUPAL_CMS_TAG
12+
# image: wodby/drupal:$DRUPAL_TAG
1113
environment:
1214
PHP_FPM_CLEAR_ENV: "no"
1315
volumes:
14-
- codebase:/var/www/html
16+
- codebase:/var/www/html
1517

1618
nginx:
1719
volumes:

‎tests/7/feature_search_api_solr/feature_search_api_solr.features.inc‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎tests/7/feature_search_api_solr/feature_search_api_solr.info‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎tests/7/feature_search_api_solr/feature_search_api_solr.module‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎tests/7/test.settings.php‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎tests/7/tests.sh‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)