resolved conflicts

docker/statistics/Makefile

@@ -0,0 +1,70 @@
+.PHONY: hello_world
+
+container=app
+
+hello_world:
+	@echo "Hello World, this is the makefile for Streamline"
+
+# make initialize_project
+initialize_project:
+	bash ./scripts/add_submodules.sh
+	if ! [ -f .env ];then cp .env.example .env;fi
+	@echo "Please fill in the environmental variables in the .env file"
+
+# make remove_submodules
+remove_submodules:
+	bash ./scripts/remove_submodules.sh
+	bash ./scripts/add_submodules.sh
+
+add_submodules:
+	bash ./scripts/add_submodules.sh
+
+add_submodules_local:
+	bash ./scripts/add_submodules_local.sh
+
+# make checkout_to_branch branch='the branch you want'
+checkout_to_branch:
+	bash ./scripts/checkout_to_branch.sh
+
+# make update_instance
+update_instance:
+	bash ./scripts/update_instance.sh
+
+# make update_instance_all_branches
+update_instance_all_branches:
+	bash ./scripts/update_instance_all_branches.sh
+
+# make build_local_app for instances not using docker
+build_local_app:
+	composer install
+	php artisan key:generate
+	php artisan storage:link
+	php artisan migrate --seed
+	sudo chmod 777 -R storage
+	sudo chmod 777 -R bootstrap/cache
+	sudo chmod 777 -R public/uploads
+	sudo chown -R www-data:www-data storage
+	sudo chown -R www-data:www-data bootstrap/cache
+	sudo chown -R www-data:www-data public/uploads
+
+# make build_docker_app
+build_docker_app:
+	docker-compose build ${container}
+	docker-compose up -d
+	docker-compose run --rm ${container} composer install
+	docker-compose run --rm ${container} php artisan key:generate
+	docker-compose run --rm ${container} php artisan storage:link
+	docker-compose run --rm ${container} php artisan migrate --seed
+	docker-compose run --rm ${container} chmod 777 -R /var/www/storage
+	docker-compose run --rm ${container} chmod 777 -R /var/www/bootstrap/cache
+	docker-compose run --rm ${container} chmod 777 -R /var/www/public/uploads
+	docker-compose run --rm ${container} chown -R www-data:www-data /var/www/storage
+	docker-compose run --rm ${container} chown -R www-data:www-data /var/www/bootstrap/cache
+	docker-compose run --rm ${container} chown -R www-data:www-data /var/www/public/uploads
+
+# make clean_project
+clean_project:
+	docker-compose run --rm ${container} php artisan cache:clear
+	docker-compose run --rm ${container} php artisan view:clear
+
+