refactor(docker): update configs

parent 6145a2ef
...@@ -6,14 +6,14 @@ services: ...@@ -6,14 +6,14 @@ services:
environment: environment:
- MARIADB_ROOT_PASSWORD=123123rr - MARIADB_ROOT_PASSWORD=123123rr
volumes: volumes:
- ./db/data:/bitnami/mariadb/data:Z - /bitnami/mariadb
tty: true tty: true
ports: ports:
- "3306" - "3306"
bitrix: bitrix:
container_name: DEV-%PROJECT_NUM% container_name: DEV-%PROJECT_NUM%
image: zolotoykod/bitrix:latest image: zolotoykod/bitrix:latest
command: /run.sh command: sudo /run.sh
volumes: volumes:
- ./www:/home/bitrix/www:Z - ./www:/home/bitrix/www:Z
depends_on: depends_on:
...@@ -25,7 +25,10 @@ services: ...@@ -25,7 +25,10 @@ services:
- "22" - "22"
environment: environment:
- VIRTUAL_HOST=DEV-%PROJECT_NUM%.zolotoykod.ru - VIRTUAL_HOST=DEV-%PROJECT_NUM%.zolotoykod.ru
- HOME=/home/bitrix
dns: dns:
- 8.8.8.8 - 8.8.8.8
- 8.8.4.4 - 8.8.4.4
tty: true tty: true
user: bitrix
working_dir: /home/bitrix/www
...@@ -4,7 +4,6 @@ stages: ...@@ -4,7 +4,6 @@ stages:
cache: cache:
untracked: true untracked: true
paths: paths:
- db/
- www/bitrix/ - www/bitrix/
- www/upload/ - www/upload/
- www/vendor/ - www/vendor/
...@@ -14,7 +13,12 @@ build: ...@@ -14,7 +13,12 @@ build:
stage: build stage: build
script: script:
- docker-compose up -d - docker-compose up -d
- docker exec -it DEV-%PROJECT_NUM% bash -c 'cd /home/bitrix/www/ && yarn install' - docker exec -i DEV-%PROJECT_NUM% bash -c 'yarn install'
- docker exec -it DEV-%PROJECT_NUM% bash -c 'cd /home/bitrix/www/ && composer update' - docker exec -i DEV-%PROJECT_NUM% bash -c 'composer update'
- docker exec -it DEV-%PROJECT_NUM% bash -c 'cd /home/bitrix/www/ && gulp' - docker exec -i DEV-%PROJECT_NUM% bash -c 'gulp'
- docker exec -it DEV-%PROJECT_NUM% bash -c 'cd /home/bitrix/www/ && php migrator migrate'
migrations:
stage: build
script:
- docker exec -i DEV-%PROJECT_NUM% bash -c 'php migrator migrate'
allow_failure: true
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment