Skip to content

Commit f6f6d88

Browse files
gregharveygregharvey
committed
Merging devel.
2 parents ea56c55 + 9fa3363 commit f6f6d88

File tree

6 files changed

+232
-161
lines changed

6 files changed

+232
-161
lines changed

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

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

88
jobs:
9-
build:
9+
build-drupal9:
1010
runs-on: ubuntu-20.04
1111
steps:
1212
- uses: actions/checkout@v2
@@ -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-20.04
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/drupal10/ce-dev/ansible/provision.yml.j2

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,60 @@
11
- hosts: {{ project_name }}-web
22
become: true
33
vars:
4-
- _domain_name: www.{{ project_name }}.local
5-
- _env_type: dev
6-
- project_name: {{ project_name }}
7-
- rkhunter:
8-
allow_ssh_root_user: prohibit-password
9-
- mysql_client:
10-
host: {{ project_name }}-db
11-
user: root
12-
password: ce-dev
4+
_domain_name: www.{{ project_name }}.local
5+
_env_type: dev
6+
project_name: {{ project_name }}
7+
rkhunter:
8+
allow_ssh_root_user: prohibit-password
9+
mysql_client:
10+
host: {{ project_name }}-db
11+
user: root
12+
password: ce-dev
1313
{% raw %}
14-
- nginx:
15-
domains:
16-
- server_name: "{{ _domain_name }}"
17-
access_log: "/var/log/nginx-access.log"
18-
error_log: "/var/log/nginx-error.log"
19-
error_log_level: "notice"
20-
webroot: "/home/ce-dev/deploy/live.local/web"
21-
project_type: "drupal8"
22-
ssl:
23-
domain: "{{ _domain_name }}"
24-
cert: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}.pem"
25-
key: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}-key.pem"
26-
handling: "unmanaged"
27-
ratelimitingcrawlers: false
28-
is_default: true
29-
servers:
30-
- port: 80
31-
ssl: false
32-
https_redirect: true
33-
- port: 443
34-
ssl: true
35-
https_redirect: false
36-
upstreams: []
37-
- php:
38-
version:
39-
- 8.1
40-
cli:
41-
memory_limit: -1
42-
_env_type: dev
43-
fpm:
44-
_env_type: dev
45-
- php_composer:
46-
version: ''
47-
version_branch: '--2'
48-
keep_updated: true
49-
- xdebug:
50-
cli: true
51-
- lhci:
52-
enable_vnc: true
53-
- nodejs:
54-
version: 18.x
55-
- apt_unattended_upgrades:
56-
enable: false
14+
nginx:
15+
domains:
16+
- server_name: "{{ _domain_name }}"
17+
access_log: "/var/log/nginx-access.log"
18+
error_log: "/var/log/nginx-error.log"
19+
error_log_level: "notice"
20+
webroot: "/home/ce-dev/deploy/live.local/web"
21+
project_type: "drupal8"
22+
ssl:
23+
domain: "{{ _domain_name }}"
24+
cert: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}.pem"
25+
key: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}-key.pem"
26+
handling: "unmanaged"
27+
ratelimitingcrawlers: false
28+
is_default: true
29+
servers:
30+
- port: 80
31+
ssl: false
32+
https_redirect: true
33+
- port: 443
34+
ssl: true
35+
https_redirect: false
36+
upstreams: []
37+
php:
38+
version:
39+
- 8.1
40+
cli:
41+
memory_limit: -1
42+
_env_type: dev
43+
fpm:
44+
_env_type: dev
45+
php_composer:
46+
version: ''
47+
version_branch: '--2'
48+
keep_updated: true
49+
xdebug:
50+
cli: true
51+
fpm: true
52+
lhci:
53+
enable_vnc: true
54+
nodejs:
55+
version: 18.x
56+
apt_unattended_upgrades:
57+
enable: false
5758
{% endraw %}
5859
tasks:
5960
- ansible.builtin.apt:

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

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,54 @@
11
- hosts: {{ project_name }}-web
22
become: true
33
vars:
4-
- _domain_name: www.{{ project_name }}.local
5-
- _env_type: dev
6-
- project_name: {{ project_name }}
7-
- rkhunter:
8-
allow_ssh_root_user: prohibit-password
9-
- mysql_client:
10-
host: {{ project_name }}-db
11-
user: root
12-
password: ce-dev
4+
_domain_name: www.{{ project_name }}.local
5+
_env_type: dev
6+
project_name: {{ project_name }}
7+
rkhunter:
8+
allow_ssh_root_user: prohibit-password
9+
mysql_client:
10+
host: {{ project_name }}-db
11+
user: root
12+
password: ce-dev
1313
{% raw %}
14-
- nginx:
15-
domains:
16-
- server_name: "{{ _domain_name }}"
17-
access_log: "/var/log/nginx-access.log"
18-
error_log: "/var/log/nginx-error.log"
19-
error_log_level: "notice"
20-
webroot: "/home/ce-dev/deploy/live.local/web"
21-
project_type: "drupal8"
22-
ssl:
23-
domain: "{{ _domain_name }}"
24-
cert: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}.pem"
25-
key: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}-key.pem"
26-
handling: "unmanaged"
27-
ratelimitingcrawlers: false
28-
is_default: true
29-
servers:
30-
- port: 80
31-
ssl: false
32-
https_redirect: true
33-
- port: 443
34-
ssl: true
35-
https_redirect: false
36-
upstreams: []
37-
- php:
38-
version:
39-
- 7.4
40-
cli:
41-
memory_limit: -1
42-
_env_type: dev
43-
fpm:
44-
_env_type: dev
45-
- xdebug:
46-
cli: true
47-
- lhci:
48-
enable_vnc: true
49-
- apt_unattended_upgrades:
50-
enable: false
14+
nginx:
15+
domains:
16+
- server_name: "{{ _domain_name }}"
17+
access_log: "/var/log/nginx-access.log"
18+
error_log: "/var/log/nginx-error.log"
19+
error_log_level: "notice"
20+
webroot: "/home/ce-dev/deploy/live.local/web"
21+
project_type: "drupal8"
22+
ssl:
23+
domain: "{{ _domain_name }}"
24+
cert: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}.pem"
25+
key: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}-key.pem"
26+
handling: "unmanaged"
27+
ratelimitingcrawlers: false
28+
is_default: true
29+
servers:
30+
- port: 80
31+
ssl: false
32+
https_redirect: true
33+
- port: 443
34+
ssl: true
35+
https_redirect: false
36+
upstreams: []
37+
php:
38+
version:
39+
- 7.4
40+
cli:
41+
memory_limit: -1
42+
_env_type: dev
43+
fpm:
44+
_env_type: dev
45+
xdebug:
46+
cli: true
47+
fpm: true
48+
lhci:
49+
enable_vnc: true
50+
apt_unattended_upgrades:
51+
enable: false
5152
{% endraw %}
5253
pre_tasks:
5354
# Debian has nodejs 12.x installed by default.

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

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,60 @@
11
- hosts: {{ project_name }}-web
22
become: true
33
vars:
4-
- _domain_name: www.{{ project_name }}.local
5-
- _env_type: dev
6-
- project_name: {{ project_name }}
7-
- rkhunter:
8-
allow_ssh_root_user: prohibit-password
9-
- mysql_client:
10-
host: {{ project_name }}-db
11-
user: root
12-
password: ce-dev
4+
_domain_name: www.{{ project_name }}.local
5+
_env_type: dev
6+
project_name: {{ project_name }}
7+
rkhunter:
8+
allow_ssh_root_user: prohibit-password
9+
mysql_client:
10+
host: {{ project_name }}-db
11+
user: root
12+
password: ce-dev
1313
{% raw %}
14-
- nginx:
15-
domains:
16-
- server_name: "{{ _domain_name }}"
17-
access_log: "/var/log/nginx-access.log"
18-
error_log: "/var/log/nginx-error.log"
19-
error_log_level: "notice"
20-
webroot: "/home/ce-dev/deploy/live.local/web"
21-
project_type: "drupal8"
22-
ssl:
23-
domain: "{{ _domain_name }}"
24-
cert: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}.pem"
25-
key: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}-key.pem"
26-
handling: "unmanaged"
27-
ratelimitingcrawlers: false
28-
is_default: true
29-
servers:
30-
- port: 80
31-
ssl: false
32-
https_redirect: true
33-
- port: 443
34-
ssl: true
35-
https_redirect: false
36-
upstreams: []
37-
- php:
38-
version:
39-
- 8.0
40-
cli:
41-
memory_limit: -1
42-
_env_type: dev
43-
fpm:
44-
_env_type: dev
45-
- php_composer:
46-
version: ''
47-
version_branch: '--2'
48-
keep_updated: true
49-
- xdebug:
50-
cli: true
51-
- lhci:
52-
enable_vnc: true
53-
- nodejs:
54-
version: 16.x
55-
- apt_unattended_upgrades:
56-
enable: false
14+
nginx:
15+
domains:
16+
- server_name: "{{ _domain_name }}"
17+
access_log: "/var/log/nginx-access.log"
18+
error_log: "/var/log/nginx-error.log"
19+
error_log_level: "notice"
20+
webroot: "/home/ce-dev/deploy/live.local/web"
21+
project_type: "drupal8"
22+
ssl:
23+
domain: "{{ _domain_name }}"
24+
cert: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}.pem"
25+
key: "{{ _ce_dev_mkcert_base}}/{{ _domain_name }}-key.pem"
26+
handling: "unmanaged"
27+
ratelimitingcrawlers: false
28+
is_default: true
29+
servers:
30+
- port: 80
31+
ssl: false
32+
https_redirect: true
33+
- port: 443
34+
ssl: true
35+
https_redirect: false
36+
upstreams: []
37+
php:
38+
version:
39+
- 8.0
40+
cli:
41+
memory_limit: -1
42+
_env_type: dev
43+
fpm:
44+
_env_type: dev
45+
php_composer:
46+
version: ''
47+
version_branch: '--2'
48+
keep_updated: true
49+
xdebug:
50+
cli: true
51+
fpm: true
52+
lhci:
53+
enable_vnc: true
54+
nodejs:
55+
version: 16.x
56+
apt_unattended_upgrades:
57+
enable: false
5758
{% endraw %}
5859
tasks:
5960
- ansible.builtin.apt:

0 commit comments

Comments
 (0)