Skip to content

Commit 27ff2f7

Browse files
gregharveynfawbertDionisioFGdavids4David Suissa
authored
Bookworm upgrade pr devel (#154)
* 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 <[email protected]> Co-authored-by: David Suissa <[email protected]> * REL 1.1.21: Using composer 2 with Drupal 9 by default (#92) * 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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> 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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> 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] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> 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] <[email protected]> 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 <[email protected]> Co-authored-by: Kristjan Lilleoja <[email protected]> * 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) * Drupal template fixes pr 1.x (#126) * 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. * 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. * Bump semver from 5.7.1 to 5.7.2 (#124) * 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. * Bump semver from 5.7.1 to 5.7.2 Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](npm/node-semver@v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Updating Drupal templates. * Removing docs steps for ansible because they cannot work. --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: gregharvey <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Updating docs URL for CI to https. (#131) * Drupal template fixes pr 1.x (#133) * 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. * 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. * Updating PHP versions for templates. * Drupal template fixes pr 1.x (#135) * 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. * 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. * Updating PHP versions for templates. * Downgrading Drupal and drush for LGD. * Drupal template fixes pr 1.x (#138) * 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. * 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. * Updating PHP versions for templates. * Downgrading Drupal and drush for LGD. * LGD prebuilt template needs to use drupal9 images. * Packaging 1.2.2 with new Drupal templates. * Drupal template fixes pr 1.x (#140) * 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. * 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. * Updating PHP versions for templates. * Downgrading Drupal and drush for LGD. * LGD prebuilt template needs to use drupal9 images. * Adding another composer plugin for LGD template builds. * Upgrading base container to bullseye-slim. (#141) * Adding release info. * 66912: Added Drupal10 template (#144) * 66912: Added Drupal10 template * 66912: Added post_tasks section * 66912: Updated version to 1.2.4 * 66912: Recovered drupal8 * 66912: Fixed drupal10 text * Bump word-wrap from 1.2.3 to 1.2.4 (#136) Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update Troubleshooting.md to include more information around cgroup. (#145) * Bump debug from 4.1.1 to 4.3.4 (#146) Bumps [debug](https://github.com/debug-js/debug) from 4.1.1 to 4.3.4. - [Release notes](https://github.com/debug-js/debug/releases) - [Commits](debug-js/debug@4.1.1...4.3.4) --- updated-dependencies: - dependency-name: debug dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * #60168: Documentation: Updated Troubleshooting information for 'Ubuntu:22.x'. (#99) Co-authored-by: David Suissa <[email protected]> Co-authored-by: gregharvey <[email protected]> * Bullseye upgrade pr 1.x (#147) * Upgrading base container to bullseye-slim. * Noticed some extra references to buster. * Adding build for testing images from devel. (#149) * Creating devel containers with Debian 'bookworm' (12). * Moving ansible and boto3 installs to apt. * apt installed ansible is not in /usr/local. * Updating dependencies. * Updating yarn.lock again. * Fixing ansible paths for ce-provision 2.x. --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: nfawbert <[email protected]> Co-authored-by: Dionisio <[email protected]> Co-authored-by: davids4 <[email protected]> Co-authored-by: David Suissa <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kristjan Lilleoja <[email protected]> Co-authored-by: Kristjan Lilleoja <[email protected]> Co-authored-by: Dan Smith <[email protected]> Co-authored-by: Philip Norton <[email protected]>
1 parent 2433e1e commit 27ff2f7

File tree

8 files changed

+71
-71
lines changed

8 files changed

+71
-71
lines changed

docker-images/controller-ci/provision.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@
2424
upgrade_galaxy:
2525
enabled: false
2626
roles:
27-
- ce_provision
27+
- debian/ce_provision

docker-images/controller/provision.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@
4040
upgrade_galaxy:
4141
enabled: false
4242
roles:
43-
- ce_provision
44-
- ce_deploy
43+
- debian/ce_provision
44+
- debian/ce_deploy

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
- apt_unattended_upgrades:
1616
enable: false
1717
tasks:
18-
- apt:
18+
- ansible.builtin.apt:
1919
update_cache: true
20-
- import_role:
20+
- ansible.builtin.import_role:
2121
name: _meta/common_base
22-
- import_role:
23-
name: lhci
24-
- import_role:
25-
name: frontail
22+
- ansible.builtin.import_role:
23+
name: debian/lhci
24+
- ansible.builtin.import_role:
25+
name: debian/frontail

templates/create.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33

44
tasks:
55
- name: Create target directory.
6-
synchronize:
6+
ansible.posix.synchronize:
77
src: "{{ project_type }}/"
88
dest: "/home/ce-dev/.ce-dev-cache/{{ project_name }}"
99
- name: Init git repo.
10-
command: git init
10+
ansible.builtin.command: git init
1111
args:
1212
chdir: "/home/ce-dev/.ce-dev-cache/{{ project_name }}"
1313
- name: Generate docker compose template.
14-
template:
14+
ansible.builtin.template:
1515
src: "{{ project_type }}/ce-dev/ce-dev.compose.yml.j2"
1616
dest: "/home/ce-dev/.ce-dev-cache/{{ project_name }}/ce-dev/ce-dev.compose.yml"
1717
- name: Generate docker compose prebuilt template.
18-
template:
18+
ansible.builtin.template:
1919
src: "{{ project_type }}/ce-dev/ce-dev.compose.prebuilt.yml.j2"
2020
dest: "/home/ce-dev/.ce-dev-cache/{{ project_name }}/ce-dev/ce-dev.compose.prebuilt.yml"
2121
- name: Generate provision playbook.
22-
template:
22+
ansible.builtin.template:
2323
src: "{{ project_type }}/ce-dev/ansible/provision.yml.j2"
2424
dest: "/home/ce-dev/.ce-dev-cache/{{ project_name }}/ce-dev/ansible/provision.yml"
2525
- name: Generate deploy playbook.
26-
template:
26+
ansible.builtin.template:
2727
src: "{{ project_type }}/ce-dev/ansible/deploy.yml.j2"
2828
dest: "/home/ce-dev/.ce-dev-cache/{{ project_name }}/ce-dev/ansible/deploy.yml"

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,19 @@
5656
enable: false
5757
{% endraw %}
5858
tasks:
59-
- apt:
59+
- ansible.builtin.apt:
6060
update_cache: true
61-
- import_role:
61+
- ansible.builtin.import_role:
6262
name: _meta/common_base
63-
- import_role:
64-
name: mysql_client
65-
- import_role:
66-
name: php-cli
67-
- import_role:
68-
name: php-fpm
69-
- import_role:
70-
name: nginx
71-
- import_role:
72-
name: lhci
73-
- import_role:
74-
name: frontail
63+
- ansible.builtin.import_role:
64+
name: debian/mysql_client
65+
- ansible.builtin.import_role:
66+
name: debian/php-cli
67+
- ansible.builtin.import_role:
68+
name: debian/php-fpm
69+
- ansible.builtin.import_role:
70+
name: debian/nginx
71+
- ansible.builtin.import_role:
72+
name: debian/lhci
73+
- ansible.builtin.import_role:
74+
name: debian/frontail

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,19 @@
5757
state: absent
5858
purge: true
5959
tasks:
60-
- apt:
60+
- ansible.builtin.apt:
6161
update_cache: true
62-
- import_role:
62+
- ansible.builtin.import_role:
6363
name: _meta/common_base
64-
- import_role:
65-
name: mysql_client
66-
- import_role:
67-
name: php-cli
68-
- import_role:
69-
name: php-fpm
70-
- import_role:
71-
name: nginx
72-
- import_role:
73-
name: lhci
74-
- import_role:
75-
name: frontail
64+
- ansible.builtin.import_role:
65+
name: debian/mysql_client
66+
- ansible.builtin.import_role:
67+
name: debian/php-cli
68+
- ansible.builtin.import_role:
69+
name: debian/php-fpm
70+
- ansible.builtin.import_role:
71+
name: debian/nginx
72+
- ansible.builtin.import_role:
73+
name: debian/lhci
74+
- ansible.builtin.import_role:
75+
name: debian/frontail

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,19 @@
5656
enable: false
5757
{% endraw %}
5858
tasks:
59-
- apt:
59+
- ansible.builtin.apt:
6060
update_cache: true
61-
- import_role:
61+
- ansible.builtin.import_role:
6262
name: _meta/common_base
63-
- import_role:
64-
name: mysql_client
65-
- import_role:
66-
name: php-cli
67-
- import_role:
68-
name: php-fpm
69-
- import_role:
70-
name: nginx
71-
- import_role:
72-
name: lhci
73-
- import_role:
74-
name: frontail
63+
- ansible.builtin.import_role:
64+
name: debian/mysql_client
65+
- ansible.builtin.import_role:
66+
name: debian/php-cli
67+
- ansible.builtin.import_role:
68+
name: debian/php-fpm
69+
- ansible.builtin.import_role:
70+
name: debian/nginx
71+
- ansible.builtin.import_role:
72+
name: debian/lhci
73+
- ansible.builtin.import_role:
74+
name: debian/frontail

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@
5050
enable: false
5151
{% endraw %}
5252
tasks:
53-
- apt:
53+
- ansible.builtin.apt:
5454
update_cache: true
55-
- import_role:
55+
- ansible.builtin.import_role:
5656
name: _meta/common_base
57-
- import_role:
58-
name: mysql_client
59-
- import_role:
60-
name: php-cli
61-
- import_role:
62-
name: php-fpm
63-
- import_role:
64-
name: nginx
65-
- import_role:
66-
name: lhci
67-
- import_role:
68-
name: frontail
57+
- ansible.builtin.import_role:
58+
name: debian/mysql_client
59+
- ansible.builtin.import_role:
60+
name: debian/php-cli
61+
- ansible.builtin.import_role:
62+
name: debian/php-fpm
63+
- ansible.builtin.import_role:
64+
name: debian/nginx
65+
- ansible.builtin.import_role:
66+
name: debian/lhci
67+
- ansible.builtin.import_role:
68+
name: debian/frontail

0 commit comments

Comments
 (0)