diff --git a/README.md b/README.md index 7a63919f..6e6043da 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ There are a few ways to get help with a gEAR Portal. ## Getting involved -If you'd like to contribute to the gEAR in any form (documentation, bug fixes, new features, etc.) just fork the project and create a pull request. +If you'd like to contribute to the gEAR in any form (documentation, bug fixes, new features, etc.) just fork the project and create a pull request. Within the project, we follow this [branching model](https://nvie.com/posts/a-successful-git-branching-model/). ---- diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 02536157..66518f7b 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -6,11 +6,11 @@ networks: services: db: environment: - MYSQL_DATABASE: [database] + MYSQL_DATABASE: db MYSQL_USER: [user] - MYSQL_PASSWORD: [user_pw] - MYSQL_ROOT_PASSWORD: [root_pw] - image: mysql:8.0.29-oracle # for arm64v8 architecture + MYSQL_PASSWORD: [pw] + MYSQL_ROOT_PASSWORD: [pw] + image: mysql:8.0.20-oracle # for arm64v8 architecture networks: - gear ports: @@ -23,7 +23,7 @@ services: build: . depends_on: - db - image: umgear + image: umgear:main networks: - gear ports: @@ -40,4 +40,9 @@ services: - "5672:5672" restart: always -# TODO: Make a consumer + # consumer: + # image: busybox + # tty: true + # volumes: + # - python_vol:/opt/Python-3.10.4 + # - ..:/opt/gEAR diff --git a/docker/gear.ini.docker b/docker/gear.ini.docker index 398f1427..b3426e32 100644 --- a/docker/gear.ini.docker +++ b/docker/gear.ini.docker @@ -1,13 +1,17 @@ [database] -user = [user] -password = [pass] +user = gear +password = gearadmin host = db -name = [db_name]l +name = gear_portal [email_sender] address = [gear_email] password = [pass] +[content] +;; this is the layout users will see by default if they haven't saved one or aren't logged in +default_layout_share_id = [default_layout_share_id] + [test] host = http://localhost/ user_name = Gear Tester @@ -30,11 +34,26 @@ cart_group_master_id = 108 cart_shared_master_id = 109 cart_public_master_id = 110 +[history] +;; This allows gEAR users to see a history of their OWN actions on the dashboard +enable_user_history = 1 +;; Each of these 'count' variables specify how many of the most recent of that type of +;; search to display +history_count = 10 + [projectR_service] -enable_link = 1 hostname = [cloud_run_service_url] ;; 0 - disable, 1 - enable cloud_run_enabled = 1 ;; 0 - disable RabbitMQ, 1 - enable. Disabling could lead to potential server crashes if many jobs are run simultaneously queue_enabled = 0 -queue_host = queue +queue_host = localhost + + +[nemoarchive_import] +importer_id = [importer_id] +gcp_project_id=[gcp_project_id] +credentials_json=[path_to_credentials_json] +;; 0 - disable RabbitMQ, 1 - enable. Disabling could lead to potential server crashes if many jobs are run simultaneously +queue_enabled = 1 +queue_host = localhost \ No newline at end of file diff --git a/gear.ini b/gear.ini index 6d514f77..026e80ec 100644 --- a/gear.ini +++ b/gear.ini @@ -1,12 +1,16 @@ [database] user = gear password = gearadmin -host = db +host = localhost name = gear_portal [email_sender] -address = gearportal.igs@gmail.com -password = flrpnztkqfmgbsoj +address = [gear_email] +password = [pass] + +[content] +;; this is the layout users will see by default if they haven't saved one or aren't logged in +default_layout_share_id = [default_layout_share_id] [test] host = http://localhost/ @@ -37,22 +41,19 @@ enable_user_history = 1 ;; search to display history_count = 10 -[content] -;; this is the layout users will see by default if they haven't saved one or aren't logged in -default_layout_share_id = f64f9c22 - [projectR_service] -hostname = https://staging---projectr-service-ruvt5l3uva-uk.a.run.app +hostname = [cloud_run_service_url] ;; 0 - disable, 1 - enable cloud_run_enabled = 1 ;; 0 - disable RabbitMQ, 1 - enable. Disabling could lead to potential server crashes if many jobs are run simultaneously queue_enabled = 0 -queue_host = queue +queue_host = localhost + [nemoarchive_import] -importer_id = 1344 -gcp_project_id=nemo-analytics -credentials_json=./nemo-analytics-4b6c8d641617.json +importer_id = [importer_id] +gcp_project_id=[gcp_project_id] +credentials_json=[path_to_credentials_json] ;; 0 - disable RabbitMQ, 1 - enable. Disabling could lead to potential server crashes if many jobs are run simultaneously queue_enabled = 1 -queue_host = queue \ No newline at end of file +queue_host = localhost \ No newline at end of file