Allow branch switching pr devel (#168)

* 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)

* 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)

* 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] <support@github.com>

* Updating Drupal templates.

* Removing docs steps for ansible because they cannot work.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: gregharvey <greg.harvey@gmail.com>
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] <support@github.com>
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] <support@github.com>
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 <david.suissa@codeenigma.com>
Co-authored-by: gregharvey <greg.harvey@gmail.com>

* 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.

* Adding new variables required by controller.

* Installing ansible in a virtual environment on the container before running ce-provision.

* Missing a slash!

* Also missed a &&.

* Adding python venv support via apt in base image.

* Temporarily adding python3-venv to the controller Dockerfile.

* Installing Ansible as the ce-dev user to avoid perms issues.

* Upgrading ubuntu in CI to have systemd as default and disabling Ansible upgrades.

* Missing an ansible install var.

* Documentation for testing containers.

* Adding vscode settings to .gitignore.

* Adding devel versions of Dockerfiles and config.

* Fixing bug caused by set line.

* Updating CI for export.sh changes.

* Adding ability to switch ce-provision own branch and config branch.

* Restoring the 1.x branch.

* Missed a couple of 2.x references.

* Updating yarn.lock again.

---------

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>
Co-authored-by: Philip Norton <philipnorton42@gmail.com>

Author: 9 people

docker-images/base/Dockerfile

@@ -14,7 +14,7 @@ RUN \
   cd /tmp/unison-2.53.3 && \
   make
 
-FROM debian:bullseye-slim
+FROM unison
 
 RUN \
   set -x && \
@@ -100,4 +100,4 @@ ENV container docker
 STOPSIGNAL SIGRTMIN+3
 VOLUME [ "/sys/fs/cgroup", "/run", "/run/lock", "/tmp" ]
 
-ENTRYPOINT ["/sbin/init"]
+ENTRYPOINT ["/sbin/init"]

docker-images/controller-ci/Dockerfile

@@ -45,7 +45,7 @@ RUN \
   chmod 600 /home/controller/.ssh/id_rsa && \
   chmod 644 /home/controller/.ssh/id_rsa.pub
 
-RUN su - ce-dev -c "git clone --branch 2.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision"
+RUN su - ce-dev -c "git clone --branch 1.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision"
 
 COPY ./provision.yml /home/ce-dev/ce-provision/provision.yml
 

docker-images/controller-ci/provision.yml

@@ -13,7 +13,7 @@
         venv_path: "/home/{{ _ce_provision.username }}/ansible"
         venv_command: /usr/bin/python3 -m venv
         own_repository: https://github.com/codeenigma/ce-provision.git
-        own_repository_branch: 2.x
+        own_repository_branch: 1.x
         own_repository_skip_checkout: false
         config_repository: https://github.com/codeenigma/ce-dev-ce-provision-config.git
         config_repository_branch: 1.x
@@ -38,4 +38,4 @@
         linters:
           enabled: true
   roles:
-    - debian/ce_provision
+    - ce_provision

docker-images/controller-devel/Dockerfile

@@ -17,7 +17,7 @@ RUN \
   /tmp/*
 
 
-RUN su - ce-dev -c "git clone --branch 2.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision"
+RUN su - ce-dev -c "git clone --branch 1.x https://github.com/codeenigma/ce-provision.git /home/ce-dev/ce-provision"
 
 COPY ./provision.yml /home/ce-dev/ce-provision/provision.yml
 

docker-images/controller-devel/provision.yml

@@ -33,7 +33,7 @@
         install_username: "{{ _ce_provision.username }}"
         upgrade_timer_name: upgrade_ce_provision_ansible
         own_repository: https://github.com/codeenigma/ce-provision.git
-        own_repository_branch: 2.x
+        own_repository_branch: 1.x
         own_repository_skip_checkout: false
         config_repository: https://github.com/codeenigma/ce-dev-ce-provision-config.git
         config_repository_branch: 1.x
@@ -60,5 +60,5 @@
         linters:
           enabled: true
   roles:
-    - debian/ce_provision
-    - debian/ce_deploy
+    - ce_provision
+    - ce_deploy

docker-images/controller/provision.yml

@@ -56,5 +56,5 @@
         linters:
           enabled: true
   roles:
-    - debian/ce_provision
-    - debian/ce_deploy
+    - ce_provision
+    - ce_deploy

docker-images/dind/Dockerfile

@@ -9,7 +9,7 @@ RUN \
 RUN \
   set -x && \
   export DEBIAN_FRONTEND=noninteractive && \  
-  echo 'deb [arch=amd64] https://download.docker.com/linux/debian bullseye stable' > /etc/apt/sources.list.d/docker.list && \
+  echo 'deb [arch=amd64] https://download.docker.com/linux/debian bookworm stable' > /etc/apt/sources.list.d/docker.list && \
   curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
   apt-get update && \
   apt-get dist-upgrade -y -o Dpkg::Options::="--force-confnew" && \

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

@@ -20,6 +20,6 @@
     - ansible.builtin.import_role:
         name: _meta/common_base
     - ansible.builtin.import_role:
-        name: debian/lhci
+        name: lhci
     - ansible.builtin.import_role:
-        name: debian/frontail
+        name: frontail

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

@@ -56,19 +56,19 @@
         enable: false
 {% endraw %}
   tasks:
-    - apt:
+    - ansible.builtin.apt:
         update_cache: true
-    - import_role:
+    - ansible.builtin.import_role:
         name: _meta/common_base
-    - import_role:
+    - ansible.builtin.import_role:
         name: mysql_client
-    - import_role:
+    - ansible.builtin.import_role:
         name: php-cli
-    - import_role:
+    - ansible.builtin.import_role:
         name: php-fpm
-    - import_role:
+    - ansible.builtin.import_role:
         name: nginx
-    - import_role:
+    - ansible.builtin.import_role:
         name: lhci
-    - import_role:
+    - ansible.builtin.import_role:
         name: frontail

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

@@ -62,14 +62,14 @@
     - ansible.builtin.import_role:
         name: _meta/common_base
     - ansible.builtin.import_role:
-        name: debian/mysql_client
+        name: mysql_client
     - ansible.builtin.import_role:
-        name: debian/php-cli
+        name: php-cli
     - ansible.builtin.import_role:
-        name: debian/php-fpm
+        name: php-fpm
     - ansible.builtin.import_role:
-        name: debian/nginx
+        name: nginx
     - ansible.builtin.import_role:
-        name: debian/lhci
+        name: lhci
     - ansible.builtin.import_role:
-        name: debian/frontail
+        name: frontail