diff --git a/conf/docker/docker-compose_dev.yml b/conf/docker/docker-compose_dev.yml index 677a7e1..f768e1d 100755 --- a/conf/docker/docker-compose_dev.yml +++ b/conf/docker/docker-compose_dev.yml @@ -14,6 +14,7 @@ services: - 80:80 - 8090:8090 - 443:443 + working_dir: /var/www/html php: build: context: ../../dockerfiles/php @@ -28,11 +29,11 @@ services: build: context: ../../dockerfiles/php dockerfile: Dockerfile_ubuntu - user: "${UID}" volumes: - ../../app:/var/www/html - ../../shortcats:/var/www - ../scripts/php:/home/scripts + working_dir: /var/www/html command: sh /home/scripts/workspace.sh db: build: @@ -45,6 +46,7 @@ services: ports: - 3306:3306 restart: unless-stopped + working_dir: /home command: sh /home/scripts/start.sh mailcatcher: # restart: on-failure @@ -64,6 +66,7 @@ services: volumes: - ../scripts/nodejs:/home/scripts - ../../app:/home/app + working_dir: /home/app command: sh /home/scripts/start.sh networks: default: diff --git a/menu/develop/menu.yml b/menu/develop/menu.yml index 0fb93cb..d74fafa 100755 --- a/menu/develop/menu.yml +++ b/menu/develop/menu.yml @@ -24,7 +24,7 @@ items: # - 'docker network create -d bridge --subnet 192.168.0.0/24 --gateway 192.168.0.1 dockernet' # - 'docker-compose --project-name %(appName)s --file conf/docker/docker-compose_dev.yml up --force-recreate -d' # - 'docker exec -it %(appName)s_workspace_1 sh /home/scripts/deploy_dev.sh' - - 'echo "Просто склонируйте в ./app ларавельку и сделайте compose install"' + - 'echo "Просто склонируйте в ./app https://git.h07.ru/hrustbb2/exampleapp.git и сделайте compose install (ну, и про миграции с конфигом не забудте)"' vars: - appName 4: