moved application scripts to src/bin

Dockerfile

@@ -20,5 +20,7 @@ ADD src /app/src
 
 # Create folder writable by the application (non-persistent data)
 RUN mkdir -p /app/web/assets /app/runtime \
- && chmod 777 /app/web/assets /app/runtime \
- && echo "alias composer='sh /app/src/composer.sh'" >> /root/.bashrc
+ && chmod 777 /app/web/assets /app/runtime
+
+RUN chmod -R u+x /app/src/bin
+ENV PATH /app/src/bin:${PATH}

Makefile

@@ -51,7 +51,7 @@ init:
 
 setup:	##@docker setup application packages and database
 	echo $(COMPOSE_FILE)
-	$(DOCKER_COMPOSE) run --rm $(PHP_SERVICE) sh src/setup.sh
+	$(DOCKER_COMPOSE) run --rm $(PHP_SERVICE) setup.sh
 
 clean:  ##@docker remove application containers
 	$(DOCKER_COMPOSE) kill

src/giiant-batch.sh → src/bin/giiant-batch.sh

@@ -12,11 +12,11 @@ yii giiant-batch \
       --overwrite=1 \
       --tablePrefix=app_ \
       --modelDb=db \
-      --modelNamespace=app\\modules\\prototype\\models \
-      --modelQueryNamespace=app\\modules\\prototype\\models\\query \
+      --modelNamespace=app\\modules\\crud\\models \
+      --modelQueryNamespace=app\\modules\\crud\\models\\query \
       --crudAccessFilter=1 \
-      --crudControllerNamespace=app\\modules\\prototype\\controllers \
-      --crudSearchModelNamespace=app\\modules\\prototype\\models\\search \
-      --crudViewPath=@app/modules/prototype/views \
+      --crudControllerNamespace=app\\modules\\crud\\controllers \
+      --crudSearchModelNamespace=app\\modules\\crud\\models\\search \
+      --crudViewPath=@app/modules/crud/views \
       --crudPathPrefix= \
       --tables=app_html,app_less

src/run.sh → src/bin/run.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-sh /app/src/setup.sh
+setup.sh
 
 php-fpm

src/setup.sh → src/bin/setup.sh

@@ -10,7 +10,4 @@ mkdir -p /app/runtime/mail /app/runtime/cache /app/runtime/debug
 ./yii migrate --interactive=0 --migrationLookup=${APP_MIGRATION_LOOKUP}
 ./yii app/setup-admin-user --interactive=0
 
-# TODO: temporary workaround, folders create by appcli, are not writable by appfpm
-# TODO: chmod -R 777 /app/web/assets /app/runtime
-
 echo "\nApplication initialized."