Fixes
This commit is contained in:
parent
b8f177c40a
commit
5ee291ced9
@ -21,11 +21,13 @@ APP_CODE_PATH_CONTAINER=/data/www
|
|||||||
APPLICATION_CODE_PATH_CONTAINER=/application
|
APPLICATION_CODE_PATH_CONTAINER=/application
|
||||||
APP_CODE_PATH_HOST=../../src
|
APP_CODE_PATH_HOST=../../src
|
||||||
APPLICATION_CODE_PATH_HOST=../../
|
APPLICATION_CODE_PATH_HOST=../../
|
||||||
|
|
||||||
APP_CODE_PATH_HOST=../../src
|
APP_CODE_PATH_HOST=../../src
|
||||||
|
|
||||||
APP_HOST=app.local
|
APP_HOST=app.local
|
||||||
NETWORKS_DRIVER=bridge
|
NETWORKS_DRIVER=bridge
|
||||||
|
|
||||||
|
MYSQL_BACKUP_PATH_HOST=../../dev_db/mysql.sql
|
||||||
|
|
||||||
NGINX_HOST_HTTP_PORT=80
|
NGINX_HOST_HTTP_PORT=80
|
||||||
NGINX_HOST_HTTPS_PORT=443
|
NGINX_HOST_HTTPS_PORT=443
|
||||||
|
|
||||||
|
|||||||
@ -134,7 +134,8 @@ services:
|
|||||||
- MYSQL_PASSWORD=${MYSQL_PASSWORD?}
|
- MYSQL_PASSWORD=${MYSQL_PASSWORD?}
|
||||||
- MYSQL_ALLOW_EMPTY_PASSWORD=true
|
- MYSQL_ALLOW_EMPTY_PASSWORD=true
|
||||||
- TZ=${TIMEZONE:-UTC}
|
- TZ=${TIMEZONE:-UTC}
|
||||||
# volumes:
|
volumes:
|
||||||
|
- ${MYSQL_BACKUP_PATH_HOST?}:/docker-entrypoint-initdb.d/database.sql
|
||||||
# - mysql:/var/lib/mysql
|
# - mysql:/var/lib/mysql
|
||||||
command: mysqld --sql_mode="ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION" --character-set-server=utf8 --collation-server=utf8_slovenian_ci --innodb-flush-log-at-trx-commit=0
|
command: mysqld --sql_mode="ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION" --character-set-server=utf8 --collation-server=utf8_slovenian_ci --innodb-flush-log-at-trx-commit=0
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
@ -26,8 +26,6 @@ jobs:
|
|||||||
- name: Load Data
|
- name: Load Data
|
||||||
run: |
|
run: |
|
||||||
docker exec -i psc_local-mongodb-1 /usr/bin/mongorestore --archive < ./dev_db/mongodb.dump
|
docker exec -i psc_local-mongodb-1 /usr/bin/mongorestore --archive < ./dev_db/mongodb.dump
|
||||||
sleep 5s
|
|
||||||
docker exec -i psc_local-mysql-1 /usr/bin/mysql --host localhost psc < ./dev_db/mysql.sql
|
|
||||||
- name: Run Tests
|
- name: Run Tests
|
||||||
run: |
|
run: |
|
||||||
make test
|
make test
|
||||||
@ -58,8 +56,6 @@ jobs:
|
|||||||
- name: Load Data
|
- name: Load Data
|
||||||
run: |
|
run: |
|
||||||
docker exec -i psc_local-mongodb-1 /usr/bin/mongorestore --archive < ./dev_db/mongodb.dump
|
docker exec -i psc_local-mongodb-1 /usr/bin/mongorestore --archive < ./dev_db/mongodb.dump
|
||||||
sleep 5s
|
|
||||||
docker exec -i psc_local-mysql-1 /usr/bin/mysql --host localhost psc < ./dev_db/mysql.sql
|
|
||||||
- name: Run Tests
|
- name: Run Tests
|
||||||
run: |
|
run: |
|
||||||
make test
|
make test
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user