H-O-O-T-S/Open-RSC-Docker-Home
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ubuntu mysql-dump bug fixes

Browse Source
This commit is contained in:
Vincent Letourneau
2017-07-28 18:15:28 +02:00
parent 608def24e6
commit 63a6dd3198
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@@ -1,6 +1,5 @@
# Makefile for Docker Nginx PHP Composer MySQL # Makefile for Docker Nginx PHP Composer MySQL
# config environment
include .env include .env
# MySQL # MySQL
@@ -26,7 +25,7 @@ init:
@cp -n $(shell pwd)/web/app/composer.json.dist $(shell pwd)/web/app/composer.json @cp -n $(shell pwd)/web/app/composer.json.dist $(shell pwd)/web/app/composer.json
apidoc: apidoc:
@docker exec -i $(shell docker-compose ps -q php) php ./app/vendor/apigen/apigen/bin/apigen generate -s app/src -d app/doc @docker exec -i $(shell docker-compose ps -q php) php $(shell pwd)/app/vendor/apigen/apigen/bin/apigen generate -s app/src -d app/doc
clean: clean:
@rm -Rf data/db/mysql/* @rm -Rf data/db/mysql/*
@@ -40,14 +39,14 @@ clean:
composer-up: composer-up:
@docker run --rm -v $(shell pwd)/web/app:/app composer/composer update @docker run --rm -v $(shell pwd)/web/app:/app composer/composer update
docker-start: init docker-start:
@echo "Docker is running..." @echo "Docker is running..."
docker-compose up -d; docker-compose up -d
docker-stop: docker-stop:
docker-compose stop @docker-compose stop
docker-compose kill @docker-compose kill
docker-compose rm -f @docker-compose rm -f
@make clean @make clean
docker-sweep: docker-sweep:
@@ -60,14 +59,15 @@ gen-certs:
mysql-dump: mysql-dump:
@mkdir -p $(MYSQL_DUMPS_DIR) @mkdir -p $(MYSQL_DUMPS_DIR)
@docker exec -i $(shell docker-compose ps -q mysqldb) mysqldump --all-databases -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" > $(MYSQL_DUMPS_DIR)/db.sql @docker exec -i $(shell docker-compose ps -q mysqldb) mysqldump --all-databases -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" > $(MYSQL_DUMPS_DIR)/db.sql
@make resetOwner
mysql-restore: mysql-restore:
@docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < $(MYSQL_DUMPS_DIR)/db.sql @docker exec -i mysql mysql -u"$(MYSQL_ROOT_USER)" -p"$(MYSQL_ROOT_PASSWORD)" < $(MYSQL_DUMPS_DIR)/db.sql
test: test:
@docker exec -i $(shell docker-compose ps -q php) app/vendor/bin/phpunit --colors=always --configuration app/ @docker exec -i $(shell docker-compose ps -q php) $(shell pwd)/app/vendor/bin/phpunit --colors=always --configuration app/
tearDown: resetOwner:
chown -Rf "$(shell whoami):$(shell id -g -n $(whoami))" data web/app @$(shell chown -Rf $(SUDO_USER):$(shell id -g -n $(SUDO_USER)) $(MYSQL_DUMPS_DIR) "$(shell pwd)/etc/ssl" "$(shell pwd)/web/app" 2> /dev/null)
.PHONY: clean .PHONY: clean