This commit is contained in:
Ваше Имя 2025-07-20 19:50:19 +05:00
parent f047b5e2f9
commit fb1c2b9bd8
2 changed files with 5 additions and 2 deletions

View File

@ -14,6 +14,7 @@ services:
- 80:80 - 80:80
- 8090:8090 - 8090:8090
- 443:443 - 443:443
working_dir: /var/www/html
php: php:
build: build:
context: ../../dockerfiles/php context: ../../dockerfiles/php
@ -28,11 +29,11 @@ services:
build: build:
context: ../../dockerfiles/php context: ../../dockerfiles/php
dockerfile: Dockerfile_ubuntu dockerfile: Dockerfile_ubuntu
user: "${UID}"
volumes: volumes:
- ../../app:/var/www/html - ../../app:/var/www/html
- ../../shortcats:/var/www - ../../shortcats:/var/www
- ../scripts/php:/home/scripts - ../scripts/php:/home/scripts
working_dir: /var/www/html
command: sh /home/scripts/workspace.sh command: sh /home/scripts/workspace.sh
db: db:
build: build:
@ -45,6 +46,7 @@ services:
ports: ports:
- 3306:3306 - 3306:3306
restart: unless-stopped restart: unless-stopped
working_dir: /home
command: sh /home/scripts/start.sh command: sh /home/scripts/start.sh
mailcatcher: mailcatcher:
# restart: on-failure # restart: on-failure
@ -64,6 +66,7 @@ services:
volumes: volumes:
- ../scripts/nodejs:/home/scripts - ../scripts/nodejs:/home/scripts
- ../../app:/home/app - ../../app:/home/app
working_dir: /home/app
command: sh /home/scripts/start.sh command: sh /home/scripts/start.sh
networks: networks:
default: default:

View File

@ -24,7 +24,7 @@ items:
# - 'docker network create -d bridge --subnet 192.168.0.0/24 --gateway 192.168.0.1 dockernet' # - '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-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' # - '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: vars:
- appName - appName
4: 4: