Skip to content

Opcache: added version and bin to drupal8,9 and localgov tempaltes #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 27 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5bee26c
Fix docker-compose v2 issue and re-release to include clamav role (#68)
nfawbert Jan 28, 2022
e42ebd1
Killing old ce-dev container when updating (#70)
nfawbert Feb 2, 2022
b0dc9d9
Added Drupal9 and Localgov templates (#73)
DionisioFG Mar 9, 2022
34ce84c
New release 1.1.19 (#75)
DionisioFG Mar 10, 2022
cae50ba
Updated package.json version: 1.1.19 (#77)
DionisioFG Mar 10, 2022
79372e7
New tag to fix repo key for Chrome (#83)
DionisioFG Jul 1, 2022
4fa738c
#CE-62820: Added support for composer '2.x' in Drupal 9 provision tem…
davids4 Sep 8, 2022
70954a3
REL 1.1.21: Using composer 2 with Drupal 9 by default (#92)
DionisioFG Sep 8, 2022
62e753e
Drupal template fixes pr 1.x (#94)
gregharvey Sep 9, 2022
710a4e3
CE-DEV: some updates and tweaks (#96)
DionisioFG Sep 14, 2022
6046092
Release 1.1.23 (#97)
DionisioFG Sep 14, 2022
2dc8b59
Bump minimist from 1.2.5 to 1.2.6 (#79)
dependabot[bot] Sep 15, 2022
dd597b8
Bump ansi-regex from 3.0.0 to 3.0.1 (#84)
dependabot[bot] Sep 15, 2022
4f0e659
Bump moment from 2.27.0 to 2.29.4 (#85)
dependabot[bot] Sep 15, 2022
2dc648c
Changing 'set-current' choice to a valid one.
gregharvey Sep 15, 2022
00a7bae
Opcache: added version and bin to drupal8,9 and localgov tempaltes
DionisioFG Dec 30, 2022
9f818de
Merge branch 'devel' into opcache_update_MR_devel
DionisioFG Dec 30, 2022
5f19829
Removed git conflicts code
DionisioFG Dec 30, 2022
09926f4
Added galaxy_custom_requirements_file='' by default
DionisioFG Dec 30, 2022
f68e2a1
Merge branch 'opcache_update' into opcache_update_MR_devel
DionisioFG Dec 30, 2022
9f515f8
Added galaxy_custom_requirements_file='' by default to deploy
DionisioFG Dec 30, 2022
8f84e48
Merge branch 'opcache_update' into opcache_update_MR_devel
DionisioFG Dec 30, 2022
8b67d00
Removed galaxy_custom_requirements_file='' from DrupalX templates, th…
DionisioFG Dec 30, 2022
083a2bc
Added galaxy_custom_requirements_file='' and provision dir to ce-deploy
DionisioFG Dec 30, 2022
e7cad04
Merge branch 'opcache_update' into opcache_update_MR_devel
DionisioFG Dec 30, 2022
c80da39
Removed galaxy_custom_requirements_file='' from DrupalX provision tem…
DionisioFG Dec 30, 2022
03c819b
Merge branch 'opcache_update' into opcache_update_MR_devel
DionisioFG Dec 30, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ce-dev-publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ jobs:
git clone https://github.com/codeenigma/wikis2pages.git
cd wikis2pages
/bin/bash init.sh https://${{ secrets.GITHUB_TOKEN }}@github.com/codeenigma/ce-dev.git 1.x
/bin/sh set-current.sh ce-dev-1.x
/bin/sh set-current.sh ce-dev-local
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How come this change? 🙂

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

devel branch seems outdated if you compare with 1.x. The feature branch was created from 1.x.
https://github.com/codeenigma/ce-dev/blob/1.x/.github/workflows/ce-dev-publish-docs.yml#L44

docker exec --user ce-dev --workdir /home/ce-dev/deploy/live.local wikis2pages-hugo hugo
/bin/sh .github-actions-push.sh
cd /home/runner/wikis2pages/public/ce-dev-1.x
cd /home/runner/wikis2pages/public/ce-dev-local
git remote add ci https://${{ secrets.DOCS_GITHUB_TOKEN }}@github.com/codeenigma/ce-dev-docs.git
git push ci master
shell: bash
9 changes: 7 additions & 2 deletions RELEASE
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
1.1.22
Drupal 9 template building.
1.1.23
Changed credentials_handling to manual, to generate ce-dev and root as user/password instead of a random string.
Using vendor/drush as drush instead of the phar file.
Included lhci_run as role in the deploy step, with one tests for the homepage.
Using full command paths to define pre/post_tasks
Renamed the settings and drush templates inside ansible/web/site/default
Removed the pre_tasks in provision.yml to uninstall nodejs 12.
2 changes: 2 additions & 0 deletions docker-images/controller/provision.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
key_name: id_rsa.pub
local_dir: /home/ce-dev/ce-deploy
groups: []
galaxy_custom_requirements_file: ""
ce_provision_dir: /home/ce-dev/ce-provision
- ce_provision:
own_repository: https://github.com/codeenigma/ce-provision.git
own_repository_branch: 1.x
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ce-dev",
"description": "Local Stack wrapper tool",
"version": "1.1.22",
"version": "1.1.23",
"author": " @pm98zz-c",
"bin": {
"ce-dev": "./bin/run"
Expand Down
3 changes: 2 additions & 1 deletion templates/drupal8/ce-dev/ansible/deploy.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
no_dev: false
working_dir: "{{ deploy_path }}"
apcu_autoloader: false
- cachetool_bin: "/usr/local/bin/cachetool"
pre_tasks:
# You can safely remove these steps once you have a working composer.json.
- name: Download composer file.
Expand All @@ -43,7 +44,7 @@
dest: "{{ deploy_path }}/composer.json"
force: false
- name: Install drush.
command:
command:
cmd: composer require drush/drush "^10.6.2"
chdir: "{{ deploy_path }}"
roles:
Expand Down
2 changes: 2 additions & 0 deletions templates/drupal8/ce-dev/ansible/provision.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
_env_type: dev
fpm:
_env_type: dev
- opcache:
cachetool_version: 7.1.0
- xdebug:
cli: true
- lhci:
Expand Down
1 change: 1 addition & 0 deletions templates/drupal9/ce-dev/ansible/deploy.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
# Create a list of URLs to test with LHCI
test_urls:
- "https://{{ _domain_name }}"
- cachetool_bin: "/usr/local/bin/cachetool"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be /home/ce-dev/.bin/cachetool I think? But maybe not with ce-provision defaults - worth checking?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried with it actually, but for some reason the .bin/cachetool.phar is always the latest version of opcache. I don't know who/what installs this phar , maybe it is part of Debian Bullseye?

pre_tasks:
# You can safely remove these steps once you have a working composer.json.
- name: Download composer file.
Expand Down
2 changes: 2 additions & 0 deletions templates/drupal9/ce-dev/ansible/provision.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
_env_type: dev
fpm:
_env_type: dev
- opcache:
cachetool_version: 7.1.0
- php_composer:
version: ''
version_branch: '--2'
Expand Down
4 changes: 4 additions & 0 deletions templates/localgov/ce-dev/ansible/deploy.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
no_dev: false
working_dir: "{{ deploy_path }}"
apcu_autoloader: false
- drush:
use_vendor: true
- drush_bin: "{{ deploy_path }}/vendor/drush/drush/drush"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this better as vendor/bin/drush?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

without {{ deploy_path }} we have to play with '../../../vendor........'

- cachetool_bin: "/usr/local/bin/cachetool"
pre_tasks:
# You can safely remove these steps once you have a working composer.json.
- name: Download composer file.
Expand Down
2 changes: 2 additions & 0 deletions templates/localgov/ce-dev/ansible/provision.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
_env_type: dev
fpm:
_env_type: dev
- opcache:
cachetool_version: 7.1.0
- xdebug:
cli: true
- lhci:
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -357,9 +357,9 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.0, ansi-escapes@^4.3.1:
type-fest "^0.11.0"

ansi-regex@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
version "3.0.1"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==

ansi-regex@^4.1.0:
version "4.1.0"
Expand Down Expand Up @@ -1586,9 +1586,9 @@ minimatch@^3.0.4:
brace-expansion "^1.1.7"

minimist@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
version "1.2.6"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==

mkdirp-classic@^0.5.2:
version "0.5.3"
Expand All @@ -1603,9 +1603,9 @@ mkdirp@^0.5.1:
minimist "^1.2.5"

moment@^2.22.1:
version "2.27.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
version "2.29.4"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==

ms@^2.1.1:
version "2.1.2"
Expand Down