github
/
1Panel
mirror of https://github.com/1Panel-dev/1Panel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: 应用商店增加minio应用

pull/73/head
zhengkunwang223 2022-12-12 11:50:51 +08:00 committed by zhengkunwang223
parent 7da97bd663
commit cb3b01cfe9
10 changed files with 105 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/list.json
View File

@ -109,6 +109,19 @@
"limit": 1, "limit": 1,
"crossVersionUpdate": true, "crossVersionUpdate": true,
"source": "https://github.com/joeferner/redis-commander" "source": "https://github.com/joeferner/redis-commander"
},
{
"key": "minio",
"name": "MinIO",
"tags": ["Tool"],
"versions": ["RELEASE.2022-08-13T21-54-44Z"],
"short_desc": "开源的对象存储服务器",
"author": "minio",
"type": "tool",
"required": [],
"limit": 1,
"crossVersionUpdate": true,
"source": "https://github.com/minio/minio"
} }
] ]
} }

BIN
apps/minio/metadata/minio.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

0
apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/README.md Normal file
View File

28
apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/config.json Normal file
View File

@ -0,0 +1,28 @@
{
"formFields": [
{
"type": "text",
"labelZh": "Root 用户",
"labelEn": "User",
"required": true,
"default": "random",
"envKey": "MINIO_ROOT_USER"
},
{
"type": "text",
"labelZh": "密码",
"labelEn": "Password",
"required": true,
"default": "Password@123",
"envKey": "MINIO_ROOT_PASSWORD"
},
{
"type": "number",
"labelZh": "端口",
"labelEn": "Port",
"required": true,
"default": 9000,
"envKey": "PANEL_APP_PORT_HTTP"
}
]
}

26
apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/docker-compose.yml Normal file
View File

@ -0,0 +1,26 @@
version: '3'
services:
1panel_minio:
image: minio/minio:RELEASE.2022-08-13T21-54-44Z
container_name: 1panel_minio
ports:
- ${PANEL_APP_PORT_HTTP}:9000
- "9001:9001"
restart: always
command: server /data --console-address ":9001"
environment:
MINIO_ROOT_USER: ${MINIO_ROOT_USER}
MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD}
logging:
options:
max-size: "5M"
max-file: "10"
driver: json-file
networks:
- 1panel
volumes:
- ./data:/data
networks:
1panel:
external: true

56
apps/redis/versions/7.0.5/conf/redis.conf
View File

@ -108,7 +108,7 @@
# By default protected mode is enabled. You should disable it only if # By default protected mode is enabled. You should disable it only if
# you are sure you want clients from other hosts to connect to Redis # you are sure you want clients from other hosts to connect to Redis
# even if no authentication is configured. # even if no authentication is configured.
protected-mode no protected-mode yes
# Redis uses default hardened security configuration directives to reduce the # Redis uses default hardened security configuration directives to reduce the
# attack surface on innocent users. Therefore, several sensitive configuration # attack surface on innocent users. Therefore, several sensitive configuration
@ -338,7 +338,7 @@ daemonize no
# #
# Note that on modern Linux systems "/run/redis.pid" is more conforming # Note that on modern Linux systems "/run/redis.pid" is more conforming
# and should be used instead. # and should be used instead.
pidfile "/var/run/redis_6379.pid" pidfile /var/run/redis_6379.pid
# Specify the server verbosity level. # Specify the server verbosity level.
# This can be one of: # This can be one of:
@ -430,7 +430,7 @@ proc-title-template "{title} {listen-addr} {server-mode}"
# #
# You can set these explicitly by uncommenting the following line. # You can set these explicitly by uncommenting the following line.
# #
# save 3600 1 300 100 60 10000 save 3600 1 300 100 60 10000
# By default Redis will stop accepting writes if RDB snapshots are enabled # By default Redis will stop accepting writes if RDB snapshots are enabled
# (at least one save point) and the latest background save failed. # (at least one save point) and the latest background save failed.
@ -478,7 +478,7 @@ rdbchecksum yes
# sanitize-dump-payload no # sanitize-dump-payload no
# The filename where to dump the DB # The filename where to dump the DB
dbfilename "dump.rdb" dbfilename dump.rdb
# Remove RDB files used by replication in instances without persistence # Remove RDB files used by replication in instances without persistence
# enabled. By default this option is disabled, however there are environments # enabled. By default this option is disabled, however there are environments
@ -501,7 +501,7 @@ rdb-del-sync-files no
# The Append Only File will also be created inside this directory. # The Append Only File will also be created inside this directory.
# #
# Note that you must specify a directory here, not a file name. # Note that you must specify a directory here, not a file name.
dir "/data" dir ./
################################# REPLICATION ################################# ################################# REPLICATION #################################
@ -909,10 +909,10 @@ replica-priority 100
# commands. For instance ~* allows all the keys. The pattern # commands. For instance ~* allows all the keys. The pattern
# is a glob-style pattern like the one of KEYS. # is a glob-style pattern like the one of KEYS.
# It is possible to specify multiple patterns. # It is possible to specify multiple patterns.
# %R~<pattern> Add key read pattern that specifies which keys can be read # %R~<pattern> Add key read pattern that specifies which keys can be read
# from. # from.
# %W~<pattern> Add key write pattern that specifies which keys can be # %W~<pattern> Add key write pattern that specifies which keys can be
# written to. # written to.
# allkeys Alias for ~* # allkeys Alias for ~*
# resetkeys Flush the list of allowed keys patterns. # resetkeys Flush the list of allowed keys patterns.
# &<pattern> Add a glob-style pattern of Pub/Sub channels that can be # &<pattern> Add a glob-style pattern of Pub/Sub channels that can be
@ -939,10 +939,10 @@ replica-priority 100
# -@all. The user returns to the same state it has immediately # -@all. The user returns to the same state it has immediately
# after its creation. # after its creation.
# (<options>) Create a new selector with the options specified within the # (<options>) Create a new selector with the options specified within the
# parentheses and attach it to the user. Each option should be # parentheses and attach it to the user. Each option should be
# space separated. The first character must be ( and the last # space separated. The first character must be ( and the last
# character must be ). # character must be ).
# clearselectors Remove all of the currently attached selectors. # clearselectors Remove all of the currently attached selectors.
# Note this does not change the "root" user permissions, # Note this does not change the "root" user permissions,
# which are the permissions directly applied onto the # which are the permissions directly applied onto the
# user (outside the parentheses). # user (outside the parentheses).
@ -968,7 +968,7 @@ replica-priority 100
# Basically ACL rules are processed left-to-right. # Basically ACL rules are processed left-to-right.
# #
# The following is a list of command categories and their meanings: # The following is a list of command categories and their meanings:
# * keyspace - Writing or reading from keys, databases, or their metadata # * keyspace - Writing or reading from keys, databases, or their metadata
# in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE, # in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE,
# KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace, # KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace,
# key or metadata will also have `write` category. Commands that only read # key or metadata will also have `write` category. Commands that only read
@ -1343,6 +1343,7 @@ oom-score-adj no
# oom-score-adj-values to positive values will always succeed. # oom-score-adj-values to positive values will always succeed.
oom-score-adj-values 0 200 800 oom-score-adj-values 0 200 800
#################### KERNEL transparent hugepage CONTROL ###################### #################### KERNEL transparent hugepage CONTROL ######################
# Usually the kernel Transparent Huge Pages control is set to "madvise" or # Usually the kernel Transparent Huge Pages control is set to "madvise" or
@ -1588,8 +1589,8 @@ aof-timestamp-enabled no
# #
# cluster-node-timeout 15000 # cluster-node-timeout 15000
# The cluster port is the port that the cluster bus will listen for inbound connections on. When set # The cluster port is the port that the cluster bus will listen for inbound connections on. When set
# to the default value, 0, it will be bound to the command port + 10000. Setting this value requires # to the default value, 0, it will be bound to the command port + 10000. Setting this value requires
# you to specify the cluster bus port when executing cluster meet. # you to specify the cluster bus port when executing cluster meet.
# cluster-port 0 # cluster-port 0
@ -1724,12 +1725,12 @@ aof-timestamp-enabled no
# PubSub message by default. (client-query-buffer-limit default value is 1gb) # PubSub message by default. (client-query-buffer-limit default value is 1gb)
# #
# cluster-link-sendbuf-limit 0 # cluster-link-sendbuf-limit 0
# Clusters can configure their announced hostname using this config. This is a common use case for # Clusters can configure their announced hostname using this config. This is a common use case for
# applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based # applications that need to use TLS Server Name Indication (SNI) or dealing with DNS based
# routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS # routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS
# command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is # command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is
# communicated along the clusterbus to all nodes, setting it to an empty string will remove # communicated along the clusterbus to all nodes, setting it to an empty string will remove
# the hostname and also propagate the removal. # the hostname and also propagate the removal.
# #
# cluster-announce-hostname "" # cluster-announce-hostname ""
@ -1738,13 +1739,13 @@ aof-timestamp-enabled no
# a user defined hostname, or by declaring they have no endpoint. Which endpoint is # a user defined hostname, or by declaring they have no endpoint. Which endpoint is
# shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type # shown as the preferred endpoint is set by using the cluster-preferred-endpoint-type
# config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how # config with values 'ip', 'hostname', or 'unknown-endpoint'. This value controls how
# the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS. # the endpoint returned for MOVED/ASKING requests as well as the first field of CLUSTER SLOTS.
# If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?' # If the preferred endpoint type is set to hostname, but no announced hostname is set, a '?'
# will be returned instead. # will be returned instead.
# #
# When a cluster advertises itself as having an unknown endpoint, it's indicating that # When a cluster advertises itself as having an unknown endpoint, it's indicating that
# the server doesn't know how clients can reach the cluster. This can happen in certain # the server doesn't know how clients can reach the cluster. This can happen in certain
# networking situations where there are multiple possible routes to the node, and the # networking situations where there are multiple possible routes to the node, and the
# server doesn't know which one the client took. In this case, the server is expecting # server doesn't know which one the client took. In this case, the server is expecting
# the client to reach out on the same endpoint it used for making the last request, but use # the client to reach out on the same endpoint it used for making the last request, but use
# the port provided in the response. # the port provided in the response.
@ -1815,7 +1816,7 @@ slowlog-log-slower-than 10000
# There is no limit to this length. Just be aware that it will consume memory. # There is no limit to this length. Just be aware that it will consume memory.
# You can reclaim memory used by the slow log with SLOWLOG RESET. # You can reclaim memory used by the slow log with SLOWLOG RESET.
slowlog-max-len 10086 slowlog-max-len 128
################################ LATENCY MONITOR ############################## ################################ LATENCY MONITOR ##############################
@ -1978,7 +1979,7 @@ hll-sparse-max-bytes 3000
# zero, the limit is ignored, so for instance it is possible to set just a # zero, the limit is ignored, so for instance it is possible to set just a
# max entries limit by setting max-bytes to 0 and max-entries to the desired # max entries limit by setting max-bytes to 0 and max-entries to the desired
# value. # value.
stream-node-max-bytes 4kb stream-node-max-bytes 4096
stream-node-max-entries 100 stream-node-max-entries 100
# Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in # Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
@ -2057,7 +2058,7 @@ client-output-buffer-limit pubsub 32mb 8mb 60
# errors or data eviction. To avoid this we can cap the accumulated memory # errors or data eviction. To avoid this we can cap the accumulated memory
# used by all client connections (all pubsub and normal clients). Once we # used by all client connections (all pubsub and normal clients). Once we
# reach that limit connections will be dropped by the server freeing up # reach that limit connections will be dropped by the server freeing up
# memory. The server will attempt to drop the connections using the most # memory. The server will attempt to drop the connections using the most
# memory first. We call this mechanism "client eviction". # memory first. We call this mechanism "client eviction".
# #
# Client eviction is configured using the maxmemory-clients setting as follows: # Client eviction is configured using the maxmemory-clients setting as follows:
@ -2273,10 +2274,3 @@ jemalloc-bg-thread yes
# to suppress # to suppress
# #
# ignore-warnings ARM64-COW-BUG # ignore-warnings ARM64-COW-BUG
# Generated by CONFIG REWRITE
save 3600 1
save 300 100
save 60 10000
latency-tracking-info-percentiles 50 99 99.9
user default on nopass ~* &* +@all

2
apps/redis/versions/7.0.5/docker-compose.yml
View File

@ -7,7 +7,7 @@ services:
- 1panel - 1panel
ports: ports:
- ${PANEL_APP_PORT_HTTP}:6379 - ${PANEL_APP_PORT_HTTP}:6379
command: redis-server /etc/redis/redis.conf --save 20 1 --loglevel warning --requirepass ${PANEL_DB_ROOT_PASSWORD} command: redis-server /etc/redis/redis.conf --requirepass ${PANEL_DB_ROOT_PASSWORD}
volumes: volumes:
- ./data:/data - ./data:/data
- ./conf/redis.conf:/etc/redis/redis.conf - ./conf/redis.conf:/etc/redis/redis.conf

2
frontend/src/styles/common.scss
View File

@ -182,7 +182,7 @@
.mask-prompt { .mask-prompt {
position: absolute; position: absolute;
z-index: 9999; z-index: 9999;
top: 20%; top: 25%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }

4
frontend/src/views/app-store/installed/index.vue
View File

@ -31,8 +31,8 @@
<el-tag round effect="dark" v-if="row.canUpdate">{{ $t('app.canUpdate') }}</el-tag> <el-tag round effect="dark" v-if="row.canUpdate">{{ $t('app.canUpdate') }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('app.app')" prop="app.name"></el-table-column> <el-table-column :label="$t('app.app')" prop="app.name" show-overflow-tooltip></el-table-column>
<el-table-column :label="$t('app.version')" prop="version"></el-table-column> <el-table-column :label="$t('app.version')" prop="version" show-overflow-tooltip></el-table-column>
<el-table-column :label="$t('website.port')" prop="httpPort"></el-table-column> <el-table-column :label="$t('website.port')" prop="httpPort"></el-table-column>
<el-table-column :label="$t('app.backup')"> <el-table-column :label="$t('app.backup')">
<template #default="{ row }"> <template #default="{ row }">

12
frontend/src/views/website/website/index.vue
View File

@ -62,9 +62,15 @@
<BackupRecords ref="dialogBackupRef" /> <BackupRecords ref="dialogBackupRef" />
</LayoutContent> </LayoutContent>
</div> </div>
<el-card width="30%" v-if="nginxStatus != 'Running'" class="mask-prompt"> <div v-if="nginxIsExist">
<span style="font-size: 14px">当前未启动 OpenResty 服务</span> <el-card width="30%" v-if="nginxStatus == 'Stopped'" class="mask-prompt">
</el-card> <span style="font-size: 14px">当前未启动 OpenResty 服务</span>
</el-card>
<el-card width="30%" v-else-if="nginxStatus !== 'Running'" class="mask-prompt">
<span style="font-size: 14px">OpenResty 服务状态异常</span>
</el-card>
</div>
<el-card v-if="openNginxConfig"> <el-card v-if="openNginxConfig">
<NginxConfig :containerName="containerName" :status="nginxStatus"></NginxConfig> <NginxConfig :containerName="containerName" :status="nginxStatus"></NginxConfig>
</el-card> </el-card>