From d4f93a1f23169218d620ad49a878247d4f75ffbc Mon Sep 17 00:00:00 2001 From: chivehao Date: Tue, 15 Oct 2024 23:21:29 +0800 Subject: [PATCH 1/5] feat: add dockerhub tag dev for ikarosrun/ikaros --- apps/ikaros/dev/.env.sample | 19 ++++ apps/ikaros/dev/data.yml | 143 +++++++++++++++++++++++++++++ apps/ikaros/dev/docker-compose.yml | 48 ++++++++++ 3 files changed, 210 insertions(+) create mode 100644 apps/ikaros/dev/.env.sample create mode 100644 apps/ikaros/dev/data.yml create mode 100644 apps/ikaros/dev/docker-compose.yml diff --git a/apps/ikaros/dev/.env.sample b/apps/ikaros/dev/.env.sample new file mode 100644 index 00000000..fcb6967e --- /dev/null +++ b/apps/ikaros/dev/.env.sample @@ -0,0 +1,19 @@ +CONTAINER_NAME="ikaros" +DATA_PATH="./data" +IKAROS_ADMIN_PASSWORD="tomoki" +IKAROS_ADMIN_USERNAME="tomoki" +IKAROS_EXTERNAL_URL="http://1.2.3.4:40301" +LANG="C.UTF-8" +LANGUAGE="C:zh" +LC_ALL="C.UTF-8" +PANEL_APP_PORT_HTTP=40301 +PANEL_DB_HOST="postgresql" +PANEL_DB_HOST_NAME="postgresql" +PANEL_DB_NAME="ikaros" +PANEL_DB_PORT=5432 +PANEL_DB_TYPE="postgresql" +PANEL_DB_USER="ikaros" +PANEL_DB_USER_PASSWORD="ikaros" +PLUGIN_LOG_LEVEL="INFO" +SERVER_LOG_LEVEL="INFO" +TIME_ZONE="Asia/Shanghai" diff --git a/apps/ikaros/dev/data.yml b/apps/ikaros/dev/data.yml new file mode 100644 index 00000000..94269c4d --- /dev/null +++ b/apps/ikaros/dev/data.yml @@ -0,0 +1,143 @@ +additionalProperties: + formFields: + - child: + default: "" + envKey: PANEL_DB_HOST + required: true + type: service + default: postgresql + envKey: PANEL_DB_TYPE + labelEn: Database Service + labelZh: 数据库服务 + required: true + type: apps + values: + - label: PostgreSQL + value: postgresql + - default: ikaros + envKey: PANEL_DB_NAME + labelEn: Database + labelZh: 数据库名 + random: true + required: true + rule: paramCommon + type: text + - default: ikaros + envKey: PANEL_DB_USER + labelEn: User + labelZh: 数据库用户 + random: true + required: true + rule: paramCommon + type: text + - default: ikaros + envKey: PANEL_DB_USER_PASSWORD + labelEn: Password + labelZh: 数据库用户密码 + random: true + required: true + rule: paramComplexity + type: password + - default: 40301 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelEn: Port + labelZh: 端口 + required: true + rule: paramPort + type: number + - default: http://localhost:40301 + edit: true + envKey: IKAROS_EXTERNAL_URL + labelEn: External URL + labelZh: 外部访问地址 + required: true + rule: paramHttp + type: text + - default: "INFO" + envKey: SERVER_LOG_LEVEL + labelEn: Core Server Package Log level + labelZh: 【高级】核心Server包日志级别 + required: true + type: select + values: + - label: DEBUG + value: "DEBUG" + - label: INFO + value: "INFO" + - label: WARNING + value: "WARNING" + - label: ERROR + value: "ERROR" + - label: CRITICAL + value: "CRITICAL" + - default: "INFO" + envKey: PLUGIN_LOG_LEVEL + labelEn: Plugin Package Log level + labelZh: 【高级】插件包日志级别 + required: true + type: select + values: + - label: DEBUG + value: "DEBUG" + - label: INFO + value: "INFO" + - label: WARNING + value: "WARNING" + - label: ERROR + value: "ERROR" + - label: CRITICAL + value: "CRITICAL" + - default: "./data" + edit: true + envKey: DATA_PATH + labelEn: Data Path + labelZh: 数据路径 + required: true + type: text + - default: "tomoki" + edit: true + envKey: IKAROS_ADMIN_USERNAME + labelEn: Admin Username + labelZh: 管理员用户名 + random: true + required: true + rule: paramCommon + type: text + - default: "tomoki" + edit: true + envKey: IKAROS_ADMIN_PASSWORD + labelEn: Admin Password + labelZh: 管理员密码 + random: true + required: true + rule: paramComplexity + type: password + - default: "Asia/Shanghai" + edit: true + envKey: TIME_ZONE + labelEn: Time Zone + labelZh: 时区 + required: true + type: text + - default: "C.UTF-8" + edit: true + envKey: LANG + labelEn: Language + labelZh: 语言 + required: true + type: text + - default: "C:zh" + edit: true + envKey: LANGUAGE + labelEn: Language Setting + labelZh: 语言设置 + required: true + type: text + - default: "C.UTF-8" + edit: true + envKey: LC_ALL + labelEn: Locale Setting + labelZh: 地区设置 + required: true + type: text \ No newline at end of file diff --git a/apps/ikaros/dev/docker-compose.yml b/apps/ikaros/dev/docker-compose.yml new file mode 100644 index 00000000..e7dfc5db --- /dev/null +++ b/apps/ikaros/dev/docker-compose.yml @@ -0,0 +1,48 @@ +services: + ikaros: + image: "ikarosrun/ikaros:dev" + container_name: ${CONTAINER_NAME} + restart: always + networks: + - 1panel-network + volumes: + - ${DATA_PATH}:/root/.ikaros + ports: + - ${PANEL_APP_PORT_HTTP}:9999 + healthcheck: + test: [ "CMD", "curl", "-f", "http://localhost:9999/actuator/health"] + interval: 30s + timeout: 5s + retries: 5 + start_period: 30s + environment: + - LANG=${LANG} + - LANGUAGE=${LANGUAGE} + - LC_ALL=${LC_ALL} + - TZ=${TIME_ZONE} + command: + - --logging.charset.console=UTF-8 + - --logging.charset.file=UTF-8 + - --logging.level.run.ikaros.server=${SERVER_LOG_LEVEL} + - --logging.level.run.ikaros.plugin=${PLUGIN_LOG_LEVEL} + - --sun.jnu.encoding=UTF-8 + - --spring.r2dbc.url=r2dbc:pool:${PANEL_DB_TYPE}://${PANEL_DB_HOST}/${PANEL_DB_NAME} + - --spring.r2dbc.username=${PANEL_DB_USER} + - --spring.r2dbc.password=${PANEL_DB_USER_PASSWORD} + # Flayway + - --spring.flyway.url=jdbc:postgresql://${PANEL_DB_HOST}/${PANEL_DB_NAME} + - --spring.flyway.locations=classpath:db/${PANEL_DB_TYPE}/migration + - --spring.flyway.user=${PANEL_DB_USER} + - --spring.flyway.password=${PANEL_DB_USER_PASSWORD} + # springdoc + - --springdoc.api-docs.enabled=false + - --springdoc.swagger-ui.enabled=false + # ikaros + - --ikaros.external-url=${IKAROS_EXTERNAL_URL} + - --ikaros.security.initializer.master-username=${IKAROS_ADMIN_USERNAME} + - --ikaros.security.initializer.master-password=${IKAROS_ADMIN_PASSWORD} + labels: + createdBy: "Apps" +networks: + 1panel-network: + external: true \ No newline at end of file From 935d19c1708760392b1881e65578926e1ab8557f Mon Sep 17 00:00:00 2001 From: chivehao Date: Tue, 15 Oct 2024 23:17:15 +0800 Subject: [PATCH 2/5] opti: add edit is true for log level config --- apps/ikaros/0.16.1/data.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/ikaros/0.16.1/data.yml b/apps/ikaros/0.16.1/data.yml index 94269c4d..8ce3aea7 100644 --- a/apps/ikaros/0.16.1/data.yml +++ b/apps/ikaros/0.16.1/data.yml @@ -55,10 +55,11 @@ additionalProperties: rule: paramHttp type: text - default: "INFO" + edit: true envKey: SERVER_LOG_LEVEL labelEn: Core Server Package Log level - labelZh: 【高级】核心Server包日志级别 - required: true + labelZh: 核心Server包日志级别 + required: false type: select values: - label: DEBUG @@ -72,10 +73,11 @@ additionalProperties: - label: CRITICAL value: "CRITICAL" - default: "INFO" + edit: true envKey: PLUGIN_LOG_LEVEL labelEn: Plugin Package Log level - labelZh: 【高级】插件包日志级别 - required: true + labelZh: 插件包日志级别 + required: false type: select values: - label: DEBUG From 8409ce4f8e693f04d6fd17ab5a50b0be0f302a7a Mon Sep 17 00:00:00 2001 From: chivehao Date: Tue, 15 Oct 2024 23:31:11 +0800 Subject: [PATCH 3/5] opti: config for log level --- apps/ikaros/dev/data.yml | 10 ++++++---- apps/ikaros/dev/docker-compose.yml | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/ikaros/dev/data.yml b/apps/ikaros/dev/data.yml index 94269c4d..8ce3aea7 100644 --- a/apps/ikaros/dev/data.yml +++ b/apps/ikaros/dev/data.yml @@ -55,10 +55,11 @@ additionalProperties: rule: paramHttp type: text - default: "INFO" + edit: true envKey: SERVER_LOG_LEVEL labelEn: Core Server Package Log level - labelZh: 【高级】核心Server包日志级别 - required: true + labelZh: 核心Server包日志级别 + required: false type: select values: - label: DEBUG @@ -72,10 +73,11 @@ additionalProperties: - label: CRITICAL value: "CRITICAL" - default: "INFO" + edit: true envKey: PLUGIN_LOG_LEVEL labelEn: Plugin Package Log level - labelZh: 【高级】插件包日志级别 - required: true + labelZh: 插件包日志级别 + required: false type: select values: - label: DEBUG diff --git a/apps/ikaros/dev/docker-compose.yml b/apps/ikaros/dev/docker-compose.yml index e7dfc5db..8d47d279 100644 --- a/apps/ikaros/dev/docker-compose.yml +++ b/apps/ikaros/dev/docker-compose.yml @@ -1,6 +1,6 @@ services: ikaros: - image: "ikarosrun/ikaros:dev" + image: "ikarosrun/ikaros:v0.16.1" container_name: ${CONTAINER_NAME} restart: always networks: From 5c6061a94ea7fcbd1d44f3f755d399d6f7080073 Mon Sep 17 00:00:00 2001 From: chivehao Date: Tue, 15 Oct 2024 23:33:33 +0800 Subject: [PATCH 4/5] Revert "opti: add edit is true for log level config" This reverts commit 935d19c1708760392b1881e65578926e1ab8557f. --- apps/ikaros/0.16.1/data.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/apps/ikaros/0.16.1/data.yml b/apps/ikaros/0.16.1/data.yml index 8ce3aea7..94269c4d 100644 --- a/apps/ikaros/0.16.1/data.yml +++ b/apps/ikaros/0.16.1/data.yml @@ -55,11 +55,10 @@ additionalProperties: rule: paramHttp type: text - default: "INFO" - edit: true envKey: SERVER_LOG_LEVEL labelEn: Core Server Package Log level - labelZh: 核心Server包日志级别 - required: false + labelZh: 【高级】核心Server包日志级别 + required: true type: select values: - label: DEBUG @@ -73,11 +72,10 @@ additionalProperties: - label: CRITICAL value: "CRITICAL" - default: "INFO" - edit: true envKey: PLUGIN_LOG_LEVEL labelEn: Plugin Package Log level - labelZh: 插件包日志级别 - required: false + labelZh: 【高级】插件包日志级别 + required: true type: select values: - label: DEBUG From 09024465d44b7950215317385341b111bbe23f73 Mon Sep 17 00:00:00 2001 From: chivehao Date: Tue, 15 Oct 2024 23:35:43 +0800 Subject: [PATCH 5/5] update dockhub tag to dev --- apps/ikaros/dev/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/ikaros/dev/docker-compose.yml b/apps/ikaros/dev/docker-compose.yml index 8d47d279..e7dfc5db 100644 --- a/apps/ikaros/dev/docker-compose.yml +++ b/apps/ikaros/dev/docker-compose.yml @@ -1,6 +1,6 @@ services: ikaros: - image: "ikarosrun/ikaros:v0.16.1" + image: "ikarosrun/ikaros:dev" container_name: ${CONTAINER_NAME} restart: always networks: