Skip to content

Commit 1edfa54

Browse files
committed
Merge branch 'develop'
2 parents 2848baf + a460bff commit 1edfa54

File tree

68 files changed

+459
-1499
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+459
-1499
lines changed

.github/workflows/pr.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
on: pull_request
2+
name: Review
3+
jobs:
4+
validate-compose:
5+
runs-on: ubuntu-latest
6+
strategy:
7+
fail-fast: false
8+
matrix:
9+
version: [ 'drupal-7', 'drupal-8', 'drupal-10', 'drupal-7', 'symfony-3', 'symfony-4', 'symfony-6' ]
10+
name: Validate compose (${{ matrix.version }})
11+
steps:
12+
- uses: actions/checkout@master
13+
14+
- name: Validate local docker compose files
15+
run: |
16+
DC=$(COMPOSE_DOMAIN=test.itkdev.dk docker compose --file templates/${{ matrix.version }}/docker-compose.yml config --quiet 2>&1)
17+
[ -z "$DC" ] || { echo $DC; exit 1; }
18+
19+
- name: Validate server docker compose files
20+
run: |
21+
DC=$(COMPOSE_SERVER_DOMAIN=test.itkdev.dk docker compose --file templates/${{ matrix.version }}/docker-compose.server.yml config --quiet 2>&1)
22+
[ -z "$DC" ] || { echo $DC; exit 1; }
23+
DC=$(COMPOSE_SERVER_DOMAIN=test.itkdev.dk docker compose --file templates/${{ matrix.version }}/docker-compose.server.yml --file templates/${{ matrix.version }}/docker-compose.dev.yml config --quiet 2>&1)
24+
[ -z "$DC" ] || { echo $DC; exit 1; }
25+
DC=$(COMPOSE_SERVER_DOMAIN=test.itkdev.dk docker compose --file templates/${{ matrix.version }}/docker-compose.server.yml --file templates/${{ matrix.version }}/docker-compose.redirect.yml config --quiet 2>&1)
26+
[ -z "$DC" ] || { echo $DC; exit 1; }

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
### Added
11+
12+
- Added `serversTransport.insecureSkipVerifyAdded` in Trafik config (cf.
13+
<https://doc.traefik.io/traefik/routing/services/#insecureskipverify>).
14+
1015
### Removed
1116

1217
- Removed `nfs` volume usage for better MacOS Ventura compatibility

completion/bash/itkdev-docker-compose-completion.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ _idc_completions()
99
fi
1010

1111
# Keep the suggestions in a local variable
12-
local suggestions=($(compgen -W "dory:start dory:stop url open drush nfs:enable template:install traefik:start traefik:stop traefik:open traefik:url mail:open mail:url mailhog:open mailhog:url sql:connect sql:port sql:open xdebug xdebug2 xdebug3 hosts:insert sync sync:db sync:files images:pull composer php version bin/console" -- "${COMP_WORDS[1]}"))
12+
local suggestions=($(compgen -W "dory:start dory:stop url open drush nfs:enable template:install traefik:start traefik:stop traefik:open traefik:url mail:open mail:url mailhog:open mailhog:url sql:connect sql:log sql:port sql:open xdebug xdebug3 hosts:insert self:update sync sync:db sync:files images:pull composer php version bin/console" -- "${COMP_WORDS[1]}"))
1313

1414
COMPREPLY=("${suggestions[@]}")
1515

completion/zsh/_itkdev-docker-compose

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@ _itkdev-docker-compose() {
3333
'open[Open url in default browser.]' \
3434
'drush[Run drush command.]' \
3535
'nfs\:enable[Enable NFS volume sharing.]' \
36+
'self\:update[Update stuff.]' \
3637
'sync[Sync both database and files.]' \
3738
'sync\:db[Sync database base.]' \
3839
'sync\:files[Sync files base.]' \
3940
'sql\:connect[Print mysql command for connecting to database.]' \
41+
'sql\:log[Log SQL queries sent to database.]' \
4042
'sql\:port[Display the exposed MariaDB SQL server port.]' \
4143
'sql\:open[Open default SQL UI.]' \
4244
'template\:install[Install template]' \
@@ -48,9 +50,8 @@ _itkdev-docker-compose() {
4850
'mail\:open[Open mail url in default browser.]' \
4951
'mailhog\:url[URL for the mailhog web-interface.]' \
5052
'mailhog\:open[Open mailhog url in default browser.]' \
51-
'xdebug[Deprecated command use xdebug2 (PHP =< 7.2) or xdebug3 (PHP >= 7.3).]' \
52-
'xdebug2[Boot the containers with PHP xdebug support enabled (PHP =< 7.2).]' \
53-
'xdebug3[Boot the containers with PHP xdebug support enabled (PHP >= 7.3).]' \
53+
'xdebug[Start the containers with Xdebug enabled.]' \
54+
'xdebug3[Start the containers with Xdebug enabled.]' \
5455
'hosts\:insert[Insert the docker site url into the hosts file.]' \
5556
'images\:pull[Update/pull all docker images.]' \
5657
'composer[Run composer command inside phpfpm container.]' \

0 commit comments

Comments
 (0)