feat: update Blinko 1.1.2

apps/blinko/1.1.2/data.yml

@@ -29,13 +29,13 @@ additionalProperties:
       required: true
       rule: paramComplexity
       type: password
-    - default: ""
+    - default: "postgresql"
       envKey: PANEL_DB_HOST
       key: postgresql
       labelEn: PostgreSQL Database Service
       labelZh: PostgreSQL 数据库服务
       required: true
-      type: service
+      type: text
     - default: "5432"
       edit: true
       envKey: PANEL_DB_PORT

apps/blinko/1.1.2/docker-compose.yml

@@ -1,23 +1,18 @@
 services:
   blinko:
-    image: "blinkospace/blinko:1.0.3"
+    image: "blinkospace/blinko:1.1.2"
     container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
     environment:
       NODE_ENV: production
       NEXTAUTH_URL: ${NEXTAUTH_URL}
       NEXT_PUBLIC_BASE_URL: ${NEXT_PUBLIC_BASE_URL}
       NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
       DATABASE_URL: postgresql://${PANEL_DB_USER}:${PANEL_DB_USER_PASSWORD}@${PANEL_DB_HOST}:${PANEL_DB_PORT}/${PANEL_DB_NAME}
-    depends_on:
-      postgres:
-        condition: service_healthy
     volumes:
       - "./data:/app/.blinko"
-    restart: always
-    logging:
-      options:
-        max-size: "10m"
-        max-file: "3"
     ports:
       - "${PANEL_APP_PORT_HTTP}:1111"
     healthcheck:
@@ -26,10 +21,25 @@ services:
       timeout: 10s
       retries: 5
       start_period: 30s
-    networks:
-      - 1panel-network
     labels:
       createdBy: "Apps"
+  postgres:
+    image: postgres:14
+    container_name: ${CONTAINER_NAME}-postgres
+    restart: always
+    ports:
+      - ${PANEL_DB_PORT}:5432
+    environment:
+      POSTGRES_DB: ${PANEL_DB_NAME}
+      POSTGRES_USER: ${PANEL_DB_USER}
+      POSTGRES_PASSWORD: ${PANEL_DB_USER_PASSWORD}
+    healthcheck:
+      test:
+        ["CMD", "pg_isready", "-U", "postgres", "-d", "postgres"]
+      interval: 5s
+      timeout: 10s
+      retries: 5      
+
 networks:
   1panel-network:
     external: true

apps/blinko/latest/.env.sample

@@ -0,0 +1,11 @@
+CONTAINER_NAME="blinko"
+NEXTAUTH_SECRET="my_ultra_secure_nextauth_secret"
+NEXTAUTH_URL="http://1.2.3.4:1111"
+NEXT_PUBLIC_BASE_URL="http://1.2.3.4:1111"
+PANEL_APP_PORT_HTTP=1111
+PANEL_DB_HOST="postgresql"
+PANEL_DB_HOST_NAME="postgresql"
+PANEL_DB_NAME="blinko"
+PANEL_DB_PORT=5432
+PANEL_DB_USER="blinko"
+PANEL_DB_USER_PASSWORD="blinko"

apps/blinko/latest/data.yml

@@ -0,0 +1,70 @@
+additionalProperties:
+  formFields:
+    - default: "1111"
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: HTTP Port
+      labelZh: HTTP 端口
+      required: true
+      rule: paramPort
+      type: number
+    - default: "http://1.2.3.4:1111"
+      envKey: NEXTAUTH_URL
+      labelEn: NextAuth URL
+      labelZh: 基本 URL
+      required: true
+      rule: paramExtUrl
+      type: text
+    - default: "http://1.2.3.4:1111"
+      envKey: NEXT_PUBLIC_BASE_URL
+      labelEn: Next Public Base URL
+      labelZh: 公共基本 URL
+      required: true
+      rule: paramExtUrl
+      type: text
+    - default: "my_ultra_secure_nextauth_secret"
+      envKey: NEXTAUTH_SECRET
+      labelEn: NextAuth Secret
+      labelZh: NextAuth 密钥
+      random: true
+      required: true
+      rule: paramComplexity
+      type: password
+    - default: "postgresql"
+      envKey: PANEL_DB_HOST
+      key: postgresql
+      labelEn: PostgreSQL Database Service
+      labelZh: PostgreSQL 数据库服务
+      required: true
+      type: text
+    - default: "5432"
+      edit: true
+      envKey: PANEL_DB_PORT
+      labelEn: Database Port Number
+      labelZh: 数据库端口号
+      required: true
+      rule: paramPort
+      type: number
+    - default: "blinko"
+      envKey: PANEL_DB_NAME
+      labelEn: Database
+      labelZh: 数据库名
+      random: true
+      required: true
+      rule: paramCommon
+      type: text
+    - default: "blinko"
+      envKey: PANEL_DB_USER
+      labelEn: User
+      labelZh: 数据库用户
+      random: true
+      required: true
+      rule: paramCommon
+      type: text
+    - default: "blinko"
+      envKey: PANEL_DB_USER_PASSWORD
+      labelEn: Password
+      labelZh: 数据库用户密码
+      random: true
+      required: true
+      rule: paramComplexity
+      type: password

apps/blinko/latest/docker-compose.yml

@@ -0,0 +1,45 @@
+services:
+  blinko:
+    image: "blinkospace/blinko:latest"
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    environment:
+      NODE_ENV: production
+      NEXTAUTH_URL: ${NEXTAUTH_URL}
+      NEXT_PUBLIC_BASE_URL: ${NEXT_PUBLIC_BASE_URL}
+      NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
+      DATABASE_URL: postgresql://${PANEL_DB_USER}:${PANEL_DB_USER_PASSWORD}@${PANEL_DB_HOST}:${PANEL_DB_PORT}/${PANEL_DB_NAME}
+    volumes:
+      - "./data:/app/.blinko"
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:1111"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:1111/"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 30s
+    labels:
+      createdBy: "Apps"
+  postgres:
+    image: postgres:14
+    container_name: ${CONTAINER_NAME}-postgres
+    restart: always
+    ports:
+      - ${PANEL_DB_PORT}:5432
+    environment:
+      POSTGRES_DB: ${PANEL_DB_NAME}
+      POSTGRES_USER: ${PANEL_DB_USER}
+      POSTGRES_PASSWORD: ${PANEL_DB_USER_PASSWORD}
+    healthcheck:
+      test:
+        ["CMD", "pg_isready", "-U", "postgres", "-d", "postgres"]
+      interval: 5s
+      timeout: 10s
+      retries: 5   
+
+networks:
+  1panel-network:
+    external: true