Skip to content

Commit 3a53c3f

Browse files
committed
Remove Dory reverse proxy references
1 parent 1e88427 commit 3a53c3f

File tree

3 files changed

+2
-31
lines changed

3 files changed

+2
-31
lines changed

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 template:update traefik:start traefik:stop traefik:open traefik:url mail:open mail:url mailhog:open mailhog:url sql:cli 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]}"))
12+
local suggestions=($(compgen -W "url open drush nfs:enable template:install template:update traefik:start traefik:stop traefik:open traefik:url mail:open mail:url mailhog:open mailhog:url sql:cli 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: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ _itkdev-docker-compose() {
2727
case $state in
2828
(command)
2929
_values 'itkdev-docker-compose command' \
30-
'dory\:start[Start reverse proxy]' \
31-
'dory\:stop[Stop reverse proxy]' \
3230
'url[Print url to site.]' \
3331
'open[Open url in default browser.]' \
3432
'drush[Run drush command.]' \

scripts/itkdev-docker-compose

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -187,12 +187,6 @@ Usage: itkdev-docker-compose command [command arguments]
187187
188188
Commands:
189189
190-
dory:start
191-
Start dory reverse proxy
192-
193-
dory:stop
194-
Stop dory reverse proxy
195-
196190
url [service [port]]
197191
Print url to site or a service
198192
@@ -465,10 +459,6 @@ fi
465459

466460
# Allow traefik:start without existence of .env
467461
if [[ "$#" -gt "0" && "$1" == "traefik:start" ]]; then
468-
if [ "$(docker inspect -f '{{.State.Running}}' dory_dnsmasq 2>/dev/null)" == "true" ]; then
469-
(>&2 echo "${bold}Dory reverse proxy should be stopped first. Run itkdev-docker-compose dory:stop.${normal}")
470-
exit 22;
471-
fi
472462
docker network inspect frontend >/dev/null 2>&1 || docker network create --driver=bridge --attachable --internal=false frontend
473463
$(cd ${script_dir}/../traefik/; docker compose up -d)
474464
exit
@@ -486,22 +476,6 @@ if [[ "$#" -gt "0" && "$1" == "traefik:pull" ]]; then
486476
exit
487477
fi
488478

489-
# Allow dory:start without existence of .env
490-
if [[ "$#" -gt "0" && "$1" == "dory:start" ]]; then
491-
if [ "$(docker inspect -f '{{.State.Running}}' traefik 2>/dev/null)" == "true" ]; then
492-
(>&2 echo "${bold}Traefik reverse proxy should be stopped first. Run itkdev-docker-compose traefik:stop.${normal}")
493-
exit 22;
494-
fi
495-
dory up
496-
exit
497-
fi
498-
499-
# Allow dory:start without existence of .env
500-
if [[ "$#" -gt "0" && "$1" == "dory:stop" ]]; then
501-
dory down
502-
exit
503-
fi
504-
505479
# Allow version without existence of compose file.
506480
if [[ "$#" -gt "0" && "$1" == "version" ]]; then
507481
echo Version: ${VERSION}
@@ -560,10 +534,9 @@ fi
560534
# Check if revers proxy is running and print warning if not.
561535
set +o errexit
562536
is_treafik_running=$(docker inspect -f '{{.State.Running}}' traefik 2>/dev/null)
563-
is_dory_running=$(docker inspect -f '{{.State.Running}}' dory_dnsmasq 2>/dev/null)
564537
set -o errexit
565538

566-
if [ ! "$is_treafik_running" == "true" ] && [ ! "$is_dory_running" == "true" ]; then
539+
if [ ! "$is_treafik_running" == "true" ]; then
567540
(>&2 echo "${bold}Reverse proxy has not been started. Hostname will not be resolved to containers and not all commands will work correctly.${normal}")
568541
fi
569542

0 commit comments

Comments
 (0)