Skip to content

Commit

Permalink
Merge pull request #54 from WengerK/feature/doc-use-d10
Browse files Browse the repository at this point in the history
upgrade documentation with example using Drupal 10
  • Loading branch information
WengerK authored Mar 12, 2024
2 parents 714cb99 + 52a8c13 commit 6da8da3
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Overview:
restart: always
db:
image: mariadb:10.3.7
image: mariadb:10.3.8
environment:
MYSQL_USER: drupal
MYSQL_PASSWORD: drupal
Expand All @@ -79,7 +79,7 @@ Overview:
3. Run Docker
```shell
$ docker-compose build --pull --build-arg BASE_IMAGE_TAG=9.0 drupal
$ docker-compose build --pull --build-arg BASE_IMAGE_TAG=10.0 drupal
$ docker-compose up -d drupal
# wait on Docker to be ready, especially MariaDB that takes many seconds to be up before install.
$ docker-compose exec -u www-data drupal drush site-install standard --db-url="mysql://drupal:drupal@db/drupal" --site-name=Example -y
Expand Down Expand Up @@ -112,6 +112,10 @@ jobs:
env: BASE_IMAGE_TAG="8.9"
- name: D9.0
env: BASE_IMAGE_TAG="9.0"
- name: D10.0
env: BASE_IMAGE_TAG="10.0"
- name: D11.0
env: BASE_IMAGE_TAG="11.0"

before_install:
- docker-compose build --pull --build-arg BASE_IMAGE_TAG=${BASE_IMAGE_TAG} drupal
Expand Down Expand Up @@ -140,14 +144,14 @@ jobs:

strategy:
matrix:
drupal_version: ['8.9', '9.0']
drupal_version: ['8.9', '9.0', '9.1', '10.0', '10.1', '10.2']
module: ['my_module']
experimental: [ false ]
include:
- drupal_version: '9.1'
- drupal_version: '10.3'
module: 'my_module'
experimental: true
- drupal_version: '10.0'
- drupal_version: '11.0'
module: 'my_module'
experimental: true

Expand Down
2 changes: 1 addition & 1 deletion examples/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ARG BASE_IMAGE_TAG=9.0
ARG BASE_IMAGE_TAG=10.2
FROM wengerk/drupal-for-contrib:${BASE_IMAGE_TAG}
2 changes: 1 addition & 1 deletion examples/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
restart: always

db:
image: mariadb:10.3.7
image: mariadb:10.3.8
environment:
MYSQL_USER: drupal
MYSQL_PASSWORD: drupal
Expand Down

0 comments on commit 6da8da3

Please sign in to comment.