Skip to content

Commit 3e4b11d

Browse files
gregharveynfawbertDionisioFGdavids4David Suissa
authored
Test images pr devel (#183)
* 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> * Adding build for testing images from devel. * 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) * Allow branch switching pr 1.x (#167) * 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. * Do not base off the unison container. * Fixing 1.x Ansible installation. * Merging 1.x. (#172) * Add ansible verbose pr 1.x (#174) * Merging 1.x. * Getting rid of bookworm in 1.x because Ansible cannot install on it. * Missing paths to Dockerfile in some CI jobs. * Fixing vars formatting and adding PHP-FPM support for xdebug. * Bump braces from 3.0.2 to 3.0.3 (#180) Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](micromatch/braces@3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Supporting ability to pass a string of project types to build. * Updating GitHub Actions to split Drupal tests over two jobs. * Fixing vars formatting and adding PHP-FPM support for xdebug. (#182) * Upgrading GitHub Actions Ubuntu version. * Fixing EOF. --------- 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 b01f5e7 commit 3e4b11d

File tree

6 files changed

+83
-15
lines changed

6 files changed

+83
-15
lines changed

.github/workflows/ce-dev-PR-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: pull_request
55

66
jobs:
77
build:
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v2
1111
- name: Install modules

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
build:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2
1717
- name: Install modules

.github/workflows/ce-dev-publish-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
# Name the Job
1414
name: Publish documentation
1515
# Set the type of machine to run on
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-latest
1717

1818
steps:
1919
# Configures global Git variables for committing

.github/workflows/ce-dev-test.yml

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ on:
66
- cron: '30 3 * * *'
77

88
jobs:
9-
build:
10-
runs-on: ubuntu-20.04
9+
build-drupal9:
10+
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v2
1313
with:
@@ -36,4 +36,36 @@ jobs:
3636
run: |
3737
/bin/sh docker-images/export.sh --version latest --image-name ce-dev --dockerfile-path base
3838
/bin/sh docker-images/export.sh --version latest --image-name ce-dev-controller --dockerfile-path controller
39-
/bin/sh templates/prebuild.sh
39+
/bin/sh templates/prebuild.sh --projects "blank drupal9"
40+
41+
build-drupal10:
42+
runs-on: ubuntu-latest
43+
steps:
44+
- uses: actions/checkout@v2
45+
with:
46+
ref: '1.x'
47+
- name: Install modules
48+
run: yarn
49+
# Uses https://oclif.io/
50+
# Not strictly necessary here, but ensures the packing works
51+
- name: Pack the JS
52+
run: yarn oclif-dev pack
53+
# We build mkcert from source because releases are broken
54+
- name: Install test dependencies
55+
run: |
56+
sudo apt-get update
57+
sudo apt-get install -y p7zip-full libnss3-tools wget
58+
cd /tmp
59+
wget https://golang.org/dl/go1.16.3.linux-amd64.tar.gz
60+
sudo tar -C /usr/local -xzf go1.16.3.linux-amd64.tar.gz
61+
export PATH=$PATH:/usr/local/go/bin
62+
git clone https://github.com/FiloSottile/mkcert && cd mkcert
63+
go build -ldflags "-X main.Version=$(git describe --tags)"
64+
sudo mv ./mkcert /usr/local/bin && cd ../
65+
sudo chmod +x /usr/local/bin/mkcert
66+
rm -Rf mkcert
67+
- name: Build and test
68+
run: |
69+
/bin/sh docker-images/export.sh --version latest --image-name ce-dev --dockerfile-path base
70+
/bin/sh docker-images/export.sh --version latest --image-name ce-dev-controller --dockerfile-path controller
71+
/bin/sh templates/prebuild.sh --projects drupal10

templates/prebuild.sh

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,43 @@
11
#!/bin/sh
22
# Test project creation and pre-build image.
33
set -e
4+
5+
usage(){
6+
echo 'prebuild.sh [OPTIONS]'
7+
echo 'Test project creation and pre-build Docker images.'
8+
echo ''
9+
echo 'Available options:'
10+
echo '--projects: space separated string of project types to build, defaults to all'
11+
echo '--push: push images to the Docker registry'
12+
echo ''
13+
}
14+
15+
# Parse options arguments.
16+
parse_options(){
17+
while [ "${1:-}" ]; do
18+
case "$1" in
19+
"--projects")
20+
shift
21+
PROJECTS="$1"
22+
;;
23+
"--push")
24+
PUSH="true"
25+
;;
26+
*)
27+
usage
28+
exit 1
29+
;;
30+
esac
31+
shift
32+
done
33+
}
34+
35+
# Set default variables.
436
PROJECTS="blank drupal8 drupal9 drupal10"
37+
PUSH="false"
38+
39+
# Parse options.
40+
parse_options "$@"
541

642
# Common processing.
743
OWN_DIR=$(dirname "$0")
@@ -55,7 +91,7 @@ for PROJECT in $PROJECTS; do
5591
create_project "$PROJECT"
5692
test_project "$PROJECT"
5793
build_project "$PROJECT"
58-
if [ -n "$1" ] && [ "$1" = "--push" ]; then
94+
if [ "$PUSH" = "true" ]; then
5995
push_project "$PROJECT"
6096
fi
6197
done

yarn.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -446,11 +446,11 @@ brace-expansion@^1.1.7:
446446
concat-map "0.0.1"
447447

448448
braces@^3.0.1:
449-
version "3.0.2"
450-
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
451-
integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
449+
version "3.0.3"
450+
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
451+
integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
452452
dependencies:
453-
fill-range "^7.0.1"
453+
fill-range "^7.1.1"
454454

455455
buffer-from@^1.0.0:
456456
version "1.1.1"
@@ -1027,10 +1027,10 @@ file-entry-cache@^5.0.1:
10271027
dependencies:
10281028
flat-cache "^2.0.1"
10291029

1030-
fill-range@^7.0.1:
1031-
version "7.0.1"
1032-
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
1033-
integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
1030+
fill-range@^7.1.1:
1031+
version "7.1.1"
1032+
resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
1033+
integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
10341034
dependencies:
10351035
to-regex-range "^5.0.1"
10361036

0 commit comments

Comments
 (0)