Skip to content

Commit dc960b1

Browse files
gregharveynfawbertDionisioFGdavids4David Suissa
authored
Allow branch switching pr devel (#166)
* 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) * Updating CI for export.sh changes. * Adding ability to switch ce-provision own branch and config branch. --------- 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>
1 parent f7ae133 commit dc960b1

File tree

8 files changed

+83
-58
lines changed

8 files changed

+83
-58
lines changed

‎.github/workflows/ce-dev-build.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ jobs:
4242
- name: Build and push Docker images
4343
run: |
4444
echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
45-
/bin/sh docker-images/export.sh latest --push
45+
/bin/sh docker-images/export.sh --version latest --image-name ce-dev --dockerfile-path base --push
46+
/bin/sh docker-images/export.sh --version latest --image-name ce-dev-controller --dockerfile-path controller --push
4647
echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
4748
/bin/sh templates/prebuild.sh --push
4849
# Uses https://github.com/marketplace/actions/gh-release

‎docker-images/base/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-slim as unison
1+
FROM debian:bullseye-slim as unison
22
RUN \
33
set -x && \
44
export DEBIAN_FRONTEND=noninteractive && \
@@ -14,7 +14,7 @@ RUN \
1414
cd /tmp/unison-2.53.3 && \
1515
make
1616

17-
FROM debian:bookworm-slim
17+
FROM debian:bullseye-slim
1818

1919
RUN \
2020
set -x && \

‎docker-images/dind/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN \
99
RUN \
1010
set -x && \
1111
export DEBIAN_FRONTEND=noninteractive && \
12-
echo 'deb [arch=amd64] https://download.docker.com/linux/debian bookworm stable' > /etc/apt/sources.list.d/docker.list && \
12+
echo 'deb [arch=amd64] https://download.docker.com/linux/debian bullseye stable' > /etc/apt/sources.list.d/docker.list && \
1313
curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
1414
apt-get update && \
1515
apt-get dist-upgrade -y -o Dpkg::Options::="--force-confnew" && \

‎src/commands/provision.ts‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,53 @@
11
import AnsibleCmd from '../base-cmd-ansible-abstract'
2+
import {flags} from '@oclif/command'
23

34
export default class ProvisionCmd extends AnsibleCmd {
45
static description = 'Provision containers with Ansible playbooks.'
56

7+
static examples = [
8+
'$ ce-dev provision --branch 1.x --config 1.x',
9+
]
10+
11+
static flags = {
12+
help: flags.help({char: 'h'}),
13+
branch: flags.string({
14+
char: 'b',
15+
description: 'The branch of ce-provision to use for provisioning your containers. See https://github.com/codeenigma/ce-provision for options.',
16+
default: '1.x',
17+
}),
18+
config: flags.string({
19+
char: 'c',
20+
description: 'The branch of the ce-provision-config repository. See https://github.com/codeenigma/ce-dev-ce-provision-config for options.',
21+
default: '1.x',
22+
}),
23+
}
24+
625
protected ansibleProjectPlaybooksPath = '/home/ce-dev/projects-playbooks/provision'
726

827
protected ansibleScriptsPath = '/home/ce-dev/ce-provision'
928

1029
protected ansibleScript = 'scripts/provision.sh'
1130

31+
protected ownBranch = '1.x'
32+
33+
protected configBranch = '1.x'
34+
1235
/**
1336
* @inheritdoc
1437
*/
1538
public constructor(argv: string[], config: any) {
1639
super(argv, config)
40+
const {flags} = this.parse(ProvisionCmd)
1741
this.ansiblePaths = this.activeProjectInfo.provision
42+
this.ownBranch = flags.branch
43+
this.configBranch = flags.config
1844
}
1945

2046
protected getCommandParameters(ansiblePath: string): string {
2147
const workspace = this.ansibleProjectPlaybooksPath
2248
const repo = this.activeProjectInfo.project_name
23-
const ownBranch = '1.x'
24-
const configBranch = '1.x'
25-
let cmd = '--own-branch ' + ownBranch
26-
cmd += ' --config-branch ' + configBranch
49+
let cmd = '--own-branch ' + this.ownBranch
50+
cmd += ' --config-branch ' + this.configBranch
2751
cmd += ' --workspace ' + workspace
2852
cmd += ' --repo ' + repo
2953
cmd += ' --branch ce-dev --playbook ' + ansiblePath

‎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-
- ansible.builtin.apt:
59+
- apt:
6060
update_cache: true
61-
- ansible.builtin.import_role:
61+
- import_role:
6262
name: _meta/common_base
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
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

‎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-
- ansible.builtin.apt:
59+
- apt:
6060
update_cache: true
61-
- ansible.builtin.import_role:
61+
- import_role:
6262
name: _meta/common_base
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
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

‎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-
- ansible.builtin.apt:
53+
- apt:
5454
update_cache: true
55-
- ansible.builtin.import_role:
55+
- import_role:
5656
name: _meta/common_base
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
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

‎yarn.lock‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -648,11 +648,11 @@ cross-spawn@^7.0.2:
648648
which "^2.0.1"
649649

650650
debug@^4.0.0, debug@^4.0.1, debug@^4.1.1:
651-
version "4.1.1"
652-
resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
653-
integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
651+
version "4.3.4"
652+
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
653+
integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
654654
dependencies:
655-
ms "^2.1.1"
655+
ms "2.1.2"
656656

657657
deep-is@^0.1.3:
658658
version "0.1.3"
@@ -1614,7 +1614,7 @@ moment@^2.22.1:
16141614
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
16151615
integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
16161616

1617-
ms@^2.1.1:
1617+
ms@2.1.2:
16181618
version "2.1.2"
16191619
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
16201620
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
@@ -2369,9 +2369,9 @@ widest-line@^3.1.0:
23692369
string-width "^4.0.0"
23702370

23712371
word-wrap@^1.2.3:
2372-
version "1.2.3"
2373-
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
2374-
integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
2372+
version "1.2.4"
2373+
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
2374+
integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
23752375

23762376
wrap-ansi@^4.0.0:
23772377
version "4.0.0"

0 commit comments

Comments
 (0)