Merge branch 'main' into fix/coral-changes

flaxandteal · Mar 11, 2024 · 8737448 · 8737448
2 parents ef6223e + 16a52ec
commit 8737448
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,7 @@ RUN . ../ENV/bin/activate \
     && pip install django-debug-toolbar django-debug-toolbar-force # only needed in debug
 COPY . ${WEB_ROOT}/${ARCHES_PROJECT}/
 RUN . ../ENV/bin/activate \
-    && pip install cachetools websockets \
+    && pip install cachetools websockets pika \
     && (if [ -f ${WEB_ROOT}/${ARCHES_PROJECT}/requirements.txt ]; then pip install -r ${WEB_ROOT}/${ARCHES_PROJECT}/requirements.txt --no-binary :all:; fi)
 
 COPY docker/settings_docker.py ${WEB_ROOT}/${ARCHES_PROJECT}/${ARCHES_PROJECT}/settings_local.py

diff --git a/Dockerfile.static b/Dockerfile.static
@@ -69,12 +69,11 @@ RUN (echo "\nSTATIC_ROOT='${STATIC_ROOT}'" >> ${WEB_ROOT}/${ARCHES_PROJECT}/${AR
 RUN (echo "\nARCHES_NAMESPACE_FOR_DATA_EXPORT='${ARCHES_NAMESPACE_FOR_DATA_EXPORT}'" >> ${WEB_ROOT}/${ARCHES_PROJECT}/${ARCHES_PROJECT}/settings_local.py) && echo $STATIC_ROOT
 RUN (echo "\nPUBLIC_SERVER_ADDRESS='${PUBLIC_SERVER_ADDRESS}' or ARCHES_NAMESPACE_FOR_DATA_EXPORT" >> ${WEB_ROOT}/${ARCHES_PROJECT}/${ARCHES_PROJECT}/settings_local.py) && echo $STATIC_ROOT
 
-RUN (cd $WEB_ROOT/$ARCHES_PROJECT/$ARCHES_PROJECT && NODE_OPTIONS=--max_old_space_size=8192 NODE_PATH=./media/node_modules yarn add -D datatables.net-rowgroup-dt vue-loader @vue/compiler-sfc babel-loader html-loader clean-webpack-plugin webpack-cli mini-css-extract-plugin stylelint-webpack-plugin eslint-webpack-plugin css-loader postcss-loader sass-loader raw-loader ttf-loader file-loader url-loader cytoscape-elk ckeditor4 web-worker)
-
+RUN (cd $WEB_ROOT/arches/arches && NODE_OPTIONS=--max_old_space_size=8192 NODE_PATH=$WEB_ROOT/$ARCHES_PROJECT/$ARCHES_PROJECT/media/node_modules yarn install)
 RUN (cd $WEB_ROOT/$ARCHES_PROJECT/$ARCHES_PROJECT && NODE_OPTIONS=--max_old_space_size=8192 NODE_PATH=./media/node_modules yarn install -D)
-RUN apt-get -y install python3-libxml2 git
+RUN apt-get update && apt-get -y install python3-libxml2 git
 RUN /bin/bash -c ". ../ENV/bin/activate;\
-pip install django-debug-toolbar django-debug-toolbar-force django-authorization casbin-django-orm-adapter cachetools websockets git+https://github.com/flaxandteal/arches-orm@master;\
+pip install pika django-debug-toolbar django-debug-toolbar-force django-authorization casbin-django-orm-adapter cachetools websockets git+https://github.com/flaxandteal/arches-orm@master;\
 python manage.py createcachetable;\
 python manage.py load_ontology -s ${ARCHES_PROJECT}/pkg/ontologies;\
 python manage.py packages -o load_package -s ${ARCHES_PROJECT}/pkg/ -y --no-business_data;\

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -225,8 +225,7 @@ install_yarn_components() {
 	echo "----- INSTALLING YARN COMPONENTS -----"
 	echo ""
 	cd_yarn_folder
-	yarn add -D babel-loader html-loader clean-webpack-plugin webpack-cli mini-css-extract-plugin stylelint-webpack-plugin eslint-webpack-plugin css-loader postcss-loader sass-loader raw-loader ttf-loader file-loader url-loader cytoscape-elk ckeditor4 web-worker jquery-validation
-	yarn install
+	yarn install -D
 }
 
 #### Main commands
@@ -379,6 +378,8 @@ run_migrations() {
 	echo ""
 	cd_app_folder
 	python manage.py migrate
+	echo $?
+	echo "[output code]"
 }
 
 collect_static(){

diff --git a/settings_docker.py b/settings_docker.py
@@ -31,6 +31,10 @@
     os.getenv("RABBITMQ_PASS"),
     os.getenv("RABBITMQ_HOST", "rabbitmq")
 ))  # RabbitMQ --> "amqp://guest:guest@localhost",  Redis --> "redis://localhost:6379/0"
+RABBITMQ_USER = os.getenv("RABBITMQ_USER")
+RABBITMQ_PASS = os.getenv("RABBITMQ_PASS")
+RABBITMQ_HOST = os.getenv("RABBITMQ_HOST", "rabbitmq")
+CASBIN_RELOAD_QUEUE = os.getenv("CASBIN_RELOAD_QUEUE", "reloadQueue")
 
 for host in ELASTICSEARCH_HOSTS:
     host["scheme"] = "http"