Skip to content

Commit 7232831

Browse files
gregharveynfawbertDionisioFGdavids4David Suissa
authored
Drupal template fixes pr devel (#125)
* Fix docker-compose v2 issue and re-release to include clamav role (#68) * Killing old ce-dev container when updating (#70) * Added Drupal9 and Localgov templates (#73) * New release 1.1.19 (#75) * Updated package.json version: 1.1.19 (#77) * Updated package.json version: 1.1.19 * New tag to fix repo key for Chrome (#83) * #CE-62820: Added support for composer '2.x' in Drupal 9 provision tem… (#89) (#91) * #CE-62820: Added support for composer '2.x' in Drupal 9 provision template. * #CE-62820: Attempt to fix pull request test cases by providing a default value for the 'new_user' in provision. * #CE-62820: Attempt to fix pull request test cases by providing a default value for the 'key_name' in provision. * #CE-62820: Attempt to fix pull request test cases by providing a default values for 'ce_deploy' in provision. Co-authored-by: David Suissa <david.suissa@codeenigma.com> Co-authored-by: David Suissa <david.suissa@codeenigma.com> * REL 1.1.21: Using composer 2 with Drupal 9 by default (#92) * Adding a Drupal 9 template to ce-dev. * Testing nodejs version change with blank template. * Incrementing version for release. * There's no drupal9 template for ce-deploy. * Drupal template fixes pr 1.x (#94) * Adding a Drupal 9 template to ce-dev. * Testing nodejs version change with blank template. * Incrementing version for release. * There's no drupal9 template for ce-deploy. * CE-DEV: some updates and tweaks (#96) * Renamed the settings and drush files for ce-dev * Added nodejs 16.x as default version * Added lhci_run role by default * Some tweaks in the config * Added the if statement to read info from an optional settings.local.php file * Release 1.1.23 (#97) * Bump minimist from 1.2.5 to 1.2.6 (#79) Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump ansi-regex from 3.0.0 to 3.0.1 (#84) Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/chalk/ansi-regex/releases) - [Commits](chalk/ansi-regex@v3.0.0...v3.0.1) --- updated-dependencies: - dependency-name: ansi-regex dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump moment from 2.27.0 to 2.29.4 (#85) Bumps [moment](https://github.com/moment/moment) from 2.27.0 to 2.29.4. - [Release notes](https://github.com/moment/moment/releases) - [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md) - [Commits](moment/moment@2.27.0...2.29.4) --- updated-dependencies: - dependency-name: moment dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Changing 'set-current' choice to a valid one. * Fixing ce_provision vars in container builds. (#102) * Adding variables pr 1.x (#104) * Fixing ce_provision vars in container builds. * Fixing ce_deploy vars in container builds. * Adding variables pr 1.x (#106) * Fixing ce_provision vars in container builds. * Fixing ce_deploy vars in container builds. * Adding the option to build manually the containers. * Adding variables pr 1.x (#109) * Fixing ce_provision vars in container builds. * Fixing ce_deploy vars in container builds. * Adding the option to build manually the containers. * Still missing some vars. * Adding variables pr 1.x (#111) * Fixing ce_provision vars in container builds. * Fixing ce_deploy vars in container builds. * Adding the option to build manually the containers. * Still missing some vars. * Setting older version of Ubuntu for containers. * Fix setup on a Mac: use Docker Compose V2 with the new 'cgroup' parameter. * Bump minimatch from 3.0.4 to 3.1.2 (#107) Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Cgroup fixes pr 1.x (#115) * Fix setup on a Mac: use Docker Compose V2 with the new 'cgroup' parameter. * Fix setup on a Mac: use Docker Compose V2 with the new 'cgroup' parameter. (#113) * Documentation update for docker composer v2. * Temporarily disabling LHCI for Drupal 9 due to an HTML issue. * Preparing release of 1.2.0. * Updating release version in package.json. * Updating yarn dependencies. * Committing package-lock.json (new file with newer node versions). * Revert "Committing package-lock.json (new file with newer node versions)." This reverts commit 8912d3d. * Revert "Updating yarn dependencies." This reverts commit 94be4ab. --------- Co-authored-by: Kristjan Lilleoja <kristjan.lilleoja@yumuuv.com> Co-authored-by: Kristjan Lilleoja <kristjanlilleoja@me.com> * Adding new required ce-provision rkhunter variable. (#119) * Issue 120: docker ps change, can no longer use --format *and* --quiet. (#122) * REL 1.2.1: Fix --quiet and --format use (#123) * Updating Drupal templates. * Removing docs steps for ansible because they cannot work. * Suppressing unattended-upgrades. * Adding composer plugins to Drupal 8 deployments. * Adding the phpcodesniffer plugin for D8. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: nfawbert <62660788+nfawbert@users.noreply.github.com> Co-authored-by: Dionisio <dionisiofernandez83@gmail.com> Co-authored-by: davids4 <35807961+davids4@users.noreply.github.com> Co-authored-by: David Suissa <david.suissa@codeenigma.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kristjan Lilleoja <kristjan.lilleoja@yumuuv.com> Co-authored-by: Kristjan Lilleoja <kristjanlilleoja@me.com> Co-authored-by: Dan Smith <dan.smith@codeenigma.com>
1 parent f3cbbcb commit 7232831

File tree

13 files changed

+48
-238
lines changed

13 files changed

+48
-238
lines changed

.github/workflows/ce-provision-build-docs.yml

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

RELEASE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1.2.0
2-
Migrated to using docker compose v2 or higher.
1+
1.2.1
2+
Fix docker ps --quiet and --format use (#120)

contribute/toc.sh

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ce-dev",
33
"description": "Local Stack wrapper tool",
4-
"version": "1.2.0",
4+
"version": "1.2.1",
55
"author": " @pm98zz-c",
66
"bin": {
77
"ce-dev": "./bin/run"

templates/blank/ce-dev/ansible/provision.yml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
enable_vnc: true
1313
- nodejs:
1414
version: 14.x
15+
- apt_unattended_upgrades:
16+
enable: false
1517
tasks:
1618
- apt:
1719
update_cache: true

templates/drupal8/ce-dev/ansible/deploy.yml.j2

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,35 @@
3838
pre_tasks:
3939
# You can safely remove these steps once you have a working composer.json.
4040
- name: Download composer file.
41-
get_url:
42-
url: https://raw.githubusercontent.com/drupal/recommended-project/8.8.x/composer.json
41+
ansible.builtin.get_url:
42+
url: https://raw.githubusercontent.com/drupal/recommended-project/8.9.x/composer.json
4343
dest: "{{ deploy_path }}/composer.json"
4444
force: false
45+
- name: Adding composer/installers plugin to composer config.
46+
community.general.composer:
47+
command: config
48+
arguments: allow-plugins.composer/installers true
49+
working_dir: "{{ deploy_path }}"
50+
- name: Adding drupal/core-composer-scaffold plugin to composer config.
51+
community.general.composer:
52+
command: config
53+
arguments: allow-plugins.drupal/core-composer-scaffold true
54+
working_dir: "{{ deploy_path }}"
55+
- name: Adding drupal/core-project-message plugin to composer config.
56+
community.general.composer:
57+
command: config
58+
arguments: allow-plugins.drupal/core-project-message true
59+
working_dir: "{{ deploy_path }}"
60+
- name: Adding dealerdirect/phpcodesniffer-composer-installer plugin to composer config.
61+
community.general.composer:
62+
command: config
63+
arguments: allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
64+
working_dir: "{{ deploy_path }}"
4565
- name: Install drush.
46-
command:
47-
cmd: composer require drush/drush "^10.6.2"
48-
chdir: "{{ deploy_path }}"
66+
community.general.composer:
67+
command: require
68+
arguments: drush/drush:10.*
69+
working_dir: "{{ deploy_path }}"
4970
roles:
5071
- _init # Sets some variables the deploy scripts rely on.
5172
- composer # Composer install step.

templates/drupal8/ce-dev/ansible/provision.yml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
cli: true
4747
- lhci:
4848
enable_vnc: true
49+
- apt_unattended_upgrades:
50+
enable: false
4951
{% endraw %}
5052
pre_tasks:
5153
# Debian has nodejs 12.x installed by default.

templates/drupal9/ce-dev/ansible/deploy.yml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
# You can safely remove these steps once you have a working composer.json.
4747
- name: Download composer file.
4848
ansible.builtin.get_url:
49-
url: https://raw.githubusercontent.com/drupal/recommended-project/9.3.x/composer.json
49+
url: https://raw.githubusercontent.com/drupal/recommended-project/9.5.x/composer.json
5050
dest: "{{ deploy_path }}/composer.json"
5151
force: false
5252
- name: Install drush.

templates/drupal9/ce-dev/ansible/provision.yml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@
5252
enable_vnc: true
5353
- nodejs:
5454
version: 16.x
55+
- apt_unattended_upgrades:
56+
enable: false
5557
{% endraw %}
5658
tasks:
5759
- apt:

templates/drupal9/ce-dev/ansible/web/sites/default/ce-dev.drush.yml.j2

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

0 commit comments

Comments
 (0)