diff --git a/build-all-dockers.sh b/build-all-dockers.sh index ade39b2..9e585fa 100755 --- a/build-all-dockers.sh +++ b/build-all-dockers.sh @@ -5,13 +5,66 @@ if [ "$EUID" -ne 0 ] fi original_dir=$(pwd) +start_time=$(date +%s) ### -# Robot-control-manager +# admin-dashboard-web +### + +cd ../admin-dashboard/admin-dashboard-web/ + +./build-docker.sh + +cd "$original_dir" + +### +# admin-dashboard-backend +### + +cd ../admin-dashboard/admin-dashboard-backend/ + +./build-docker.sh + +cd "$original_dir" + +### +# robot-control-manager ### cd "../robot-control-manager/" ./build-docker.sh -cd "$original_dir" \ No newline at end of file +cd "$original_dir" + +### +# log-manager +### + +cd "../log-manager/" + +./build-docker.sh + +cd "$original_dir" + +### +# telegram-bot-manager +### + +cd "../telegram-bot-manager/" + +./build-docker.sh + +cd "$original_dir" + +### +# END +### + +end_time=$(date +%s) + +# Calculate the duration in seconds +duration=$((end_time - start_time)) + +# Output the duration +echo "Script duration: $duration seconds" \ No newline at end of file diff --git a/commit_and_push.sh b/commit_and_push.sh new file mode 100755 index 0000000..554786f --- /dev/null +++ b/commit_and_push.sh @@ -0,0 +1,7 @@ +git add * + +read -p "Commit message: " commit_message + +git commit -m "$commit_message" + +git push -u origin main \ No newline at end of file diff --git a/remote-docker-compose.yml b/remote-docker-compose.yml index dd45465..ccfadf5 100644 --- a/remote-docker-compose.yml +++ b/remote-docker-compose.yml @@ -20,16 +20,16 @@ services: - HOST=0.0.0.0 # DO NOT CHANGE THIS - PORT=8080 # DO NOT CHANGE THIS - LOG_MANAGER_SERVER_URL=http://jnx-log-manager-server:3000 + - TELEGRAM_BOT_MANAGER_ENABLED=true + - TELEGRAM_BOT_MANAGER_SERVER_URL=http://jnx-telegram-bot-manager:3001 - FOLDER_GROUPTASKS_GROUPS=/admin-dashboard-data/groupTasks/groups/ - FOLDER_GROUPTASKS_RUNNINGTASKS=/admin-dashboard-data/groupTasks/runningTasks/ - FOLDER_PUBLIC_STATIC=/admin-dashboard-data/public/ - - LOG_LANGUAGE_GROUPTASKS=./grouptasks_lang_log_messages.json - - LOG_LANGUAGE_SYSTEM=./system_lang_log_messages.json - MARIADB_HOSTNAME=mariadb - MARIADB_PORT=3306 - - MARIADB_USERNAME=admindashboard - - MARIADB_PASSWORD=QHXNcxuRRyAdxCxVCmPkEuCsPfCdfLz2 - - MARIADB_DATABASE_NAME=jnxadmindashboard + - MARIADB_USERNAME=db_user + - MARIADB_PASSWORD=db_password + - MARIADB_DATABASE_NAME=db_database_name - INVEX_API_BASE=https://XXXXXX # CHANGE HERE - INVEX_API_TOKEN=XXXXXXXXXXX # CHANGE HERE @@ -80,10 +80,34 @@ services: - LOG_FOLDER=/log-manager-data/ - DAYS_TO_KEEP_LOGS=30 + jnx-telegram-bot-manager: + container_name: jnx-telegram-bot-manager + image: jnx-telegram-bot-manager:latest + restart: always + ports: + - "3001:3000" + volumes: + - robot_control_manager_data:/app + networks: + - jnx-admin-dashboard-network + environment: + - DOCKER=true + - DEBUG=false + - COLORIZED_OUTPUT=true + - HOST=0.0.0.0 # DO NOT CHANGE THIS + - PORT=3000 # DO NOT CHANGE THIS + - LOG_MANAGER_SERVER_URL=http://localhost:50110 + - MARIADB_HOSTNAME=mariadb + - MARIADB_PORT=3306 + - MARIADB_USERNAME=db_user + - MARIADB_PASSWORD=db_password + - MARIADB_DATABASE_NAME=db_database_name + volumes: db_data: admin_dashboard_server_data: log_manager_data: + robot_control_manager_data: networks: jnx-admin-dashboard-network: