-
-
+------------------------------
## 什么是 DataEase？ ##
DataEase 是开源的数据可视化分析工具，帮助用户快速分析数据并洞察业务趋势，从而实现业务的改进与优化。DataEase 支持丰富的数据源连接，能够通过拖拉拽方式快速制作图表，并可以方便的与他人分享。
diff --git a/apps/dataease/versions/1.18.2/docker-compose.yml b/apps/dataease/versions/1.18.2/docker-compose.yml
index 2127b295..2825e1b9 100644
--- a/apps/dataease/versions/1.18.2/docker-compose.yml
+++ b/apps/dataease/versions/1.18.2/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
services:
dataease:
image: registry.cn-qingdao.aliyuncs.com/dataease/dataease:v1.18.2
- container_name: dataease
+ container_name: ${CONTAINER_NAME}
ports:
- ${PANEL_APP_PORT_HTTP}:8081
volumes:
diff --git a/apps/gitlab/metadata/logo.png b/apps/gitlab/metadata/logo.png
new file mode 100644
index 00000000..b4c82efe
Binary files /dev/null and b/apps/gitlab/metadata/logo.png differ
diff --git a/apps/gitlab/versions/15.8.3/README.md b/apps/gitlab/versions/15.8.3/README.md
new file mode 100644
index 00000000..29d5d599
--- /dev/null
+++ b/apps/gitlab/versions/15.8.3/README.md
@@ -0,0 +1,126 @@
+# GitLab
+
+## Canonical source
+
+The canonical source of GitLab where all development takes place is [hosted on GitLab.com](https://gitlab.com/gitlab-org/gitlab).
+
+If you wish to clone a copy of GitLab without proprietary code, you can use the read-only mirror of GitLab located at https://gitlab.com/gitlab-org/gitlab-foss/. However, please do not submit any issues and/or merge requests to that project.
+
+## Free trial
+
+You can request a free trial of GitLab Ultimate [on our website](https://about.gitlab.com/free-trial/).
+
+## Open source software to collaborate on code
+
+To see how GitLab looks please see the [features page on our website](https://about.gitlab.com/features/).
+
+- Manage Git repositories with fine grained access controls that keep your code secure
+- Perform code reviews and enhance collaboration with merge requests
+- Complete continuous integration (CI) and continuous deployment/delivery (CD) pipelines to build, test, and deploy your applications
+- Each project can also have an issue tracker, issue board, and a wiki
+- Used by more than 100,000 organizations, GitLab is the most popular solution to manage Git repositories on-premises
+- Completely free and open source (MIT Expat license)
+
+## Editions
+
+There are three editions of GitLab:
+
+- GitLab Community Edition (CE) is available freely under the MIT Expat license.
+- GitLab Enterprise Edition (EE) includes [extra features](https://about.gitlab.com/pricing/#compare-options) that are more useful for organizations with more than 100 users. To use EE and get official support please [become a subscriber](https://about.gitlab.com/pricing/).
+- JiHu Edition (JH) tailored specifically for the [Chinese market](https://about.gitlab.cn/).
+
+## Licensing
+
+See the [LICENSE](LICENSE) file for licensing information as it pertains to
+files in this repository.
+
+## Hiring
+
+We are hiring developers, support people, and production engineers all the time, please see our [jobs page](https://about.gitlab.com/jobs/).
+
+## Website
+
+On [about.gitlab.com](https://about.gitlab.com/) you can find more information about:
+
+- [Subscriptions](https://about.gitlab.com/pricing/)
+- [Consultancy](https://about.gitlab.com/consultancy/)
+- [Community](https://about.gitlab.com/community/)
+- [Hosted GitLab.com](https://about.gitlab.com/gitlab-com/) use GitLab as a free service
+- [GitLab Enterprise Edition](https://about.gitlab.com/features/#enterprise) with additional features aimed at larger organizations.
+- [GitLab CI](https://about.gitlab.com/gitlab-ci/) a continuous integration (CI) server that is easy to integrate with GitLab.
+
+## Requirements
+
+Please see the [requirements documentation](doc/install/requirements.md) for system requirements and more information about the supported operating systems.
+
+## Installation
+
+The recommended way to install GitLab is with the [Omnibus packages](https://about.gitlab.com/downloads/) on our package server.
+Compared to an installation from source, this is faster and less error prone.
+Just select your operating system, download the respective package (Debian or RPM) and install it using the system's package manager.
+
+There are various other options to install GitLab, please refer to the [installation page on the GitLab website](https://about.gitlab.com/installation/) for more information.
+
+## Contributing
+
+GitLab is an open source project and we are very happy to accept community contributions. Please refer to [Contributing to GitLab page](https://about.gitlab.com/contributing/) for more details.
+
+## Install a development environment
+
+To work on GitLab itself, we recommend setting up your development environment with [the GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit).
+If you do not use the GitLab Development Kit you need to install and configure all the dependencies yourself, this is a lot of work and error prone.
+One small thing you also have to do when installing it yourself is to copy the example development Puma configuration file:
+
+```shell
+cp config/puma.example.development.rb config/puma.rb
+```
+
+Instructions on how to start GitLab and how to run the tests can be found in the [getting started section of the GitLab Development Kit](https://gitlab.com/gitlab-org/gitlab-development-kit#getting-started).
+
+## Software stack
+
+GitLab is a Ruby on Rails application that runs on the following software:
+
+- Ubuntu/Debian/CentOS/RHEL/OpenSUSE
+- Ruby (MRI) 2.7.7
+- Git 2.33+
+- Redis 5.0+
+- PostgreSQL 12+
+
+For more information please see the [architecture](https://docs.gitlab.com/ee/development/architecture.html) and [requirements](https://docs.gitlab.com/ee/install/requirements.html) documentation.
+
+## UX design
+
+Please adhere to the [UX Guide](https://design.gitlab.com/) when creating designs and implementing code.
+
+## Third-party applications
+
+There are a lot of [third-party applications integrating with GitLab](https://about.gitlab.com/applications/). These include GUI Git clients, mobile applications and API wrappers for various languages.
+
+## GitLab release cycle
+
+For more information about the release process see the [release documentation](https://gitlab.com/gitlab-org/release-tools/blob/master/README.md).
+
+## Upgrading
+
+For upgrading information please see our [update page](https://about.gitlab.com/update/).
+
+## Documentation
+
+All documentation can be found on .
+
+## Getting help
+
+Please see [Getting help for GitLab](https://about.gitlab.com/getting-help/) on our website for the many options to get help.
+
+## Why?
+
+[Read here](https://about.gitlab.com/why/)
+
+## Is it any good?
+
+[Yes](https://about.gitlab.com/is-it-any-good/)
+
+## Is it awesome?
+
+[These people](https://twitter.com/gitlab/followers) seem to like it.
diff --git a/apps/gitlab/versions/15.8.3/config.json b/apps/gitlab/versions/15.8.3/config.json
new file mode 100644
index 00000000..3b912a9a
--- /dev/null
+++ b/apps/gitlab/versions/15.8.3/config.json
@@ -0,0 +1,38 @@
+{
+ "formFields": [
+ {
+ "type": "text",
+ "labelZh": "访问地址",
+ "labelEn": "Address",
+ "required": true,
+ "default": "",
+ "envKey": "GITLAB_HOSTNAME",
+ "placeholderZh": "请填写域名或者 IP 地址",
+ "placeholderEn": "Please fill in the domain name or IP address"
+ },
+ {
+ "type": "number",
+ "labelZh": "HTTP 端口",
+ "labelEn": "HTTP Port",
+ "required": true,
+ "default": 8090,
+ "envKey": "PANEL_APP_PORT_HTTP"
+ },
+ {
+ "type": "number",
+ "labelZh": "HTTPS 端口",
+ "labelEn": "HTTPS Port",
+ "required": true,
+ "default": 8443,
+ "envKey": "PANEL_APP_PORT_HTTPS"
+ },
+ {
+ "type": "number",
+ "labelZh": "SSH 端口",
+ "labelEn": "SSH Port",
+ "required": true,
+ "default": 2229,
+ "envKey": "JENKINS_SSH_PORT"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/apps/gitlab/versions/15.8.3/docker-compose.yml b/apps/gitlab/versions/15.8.3/docker-compose.yml
new file mode 100644
index 00000000..aa715789
--- /dev/null
+++ b/apps/gitlab/versions/15.8.3/docker-compose.yml
@@ -0,0 +1,25 @@
+version: '3'
+services:
+ gitlab:
+ image: 'gitlab/gitlab-ce:15.8.3-ce.0'
+ container_name: ${CONTAINER_NAME}
+ restart: always
+ hostname: ${GITLAB_HOSTNAME}
+ environment:
+ GITLAB_OMNIBUS_CONFIG: |
+ external_url 'http://${GITLAB_HOSTNAME}:${PANEL_APP_PORT_HTTP}'
+ ports:
+ - ${PANEL_APP_PORT_HTTP}:${PANEL_APP_PORT_HTTP}
+ - ${PANEL_APP_PORT_HTTPS}:443
+ - ${JENKINS_SSH_PORT}:22
+ volumes:
+ - ./config:/etc/gitlab
+ - ./logs:/var/log/gitlab
+ - ./data:/var/opt/gitlab
+ shm_size: '256m'
+ networks:
+ - 1panel-network
+
+networks:
+ 1panel-network:
+ external: true
diff --git a/apps/halo/versions/2.2.0/README.md b/apps/halo/versions/2.2.0/README.md
index 37dc29ce..a2f71576 100644
--- a/apps/halo/versions/2.2.0/README.md
+++ b/apps/halo/versions/2.2.0/README.md
@@ -1,24 +1,3 @@
-
-
------------------------------
## 快速开始 ##
diff --git a/apps/jenkins/metadata/logo.png b/apps/jenkins/metadata/logo.png
new file mode 100644
index 00000000..2f078984
Binary files /dev/null and b/apps/jenkins/metadata/logo.png differ
diff --git a/apps/jenkins/versions/2.391/README.md b/apps/jenkins/versions/2.391/README.md
new file mode 100644
index 00000000..529c8234
--- /dev/null
+++ b/apps/jenkins/versions/2.391/README.md
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+# About
+
+[](https://www.jenkins.io/changelog)
+[](https://www.jenkins.io/changelog-stable)
+[](https://hub.docker.com/r/jenkins/jenkins/)
+[](https://bestpractices.coreinfrastructure.org/projects/3538)
+
+In a nutshell, Jenkins is the leading open-source automation server.
+Built with Java, it provides over 1,800 [plugins](https://plugins.jenkins.io/) to support automating virtually anything,
+so that humans can spend their time doing things machines cannot.
+
+# What to Use Jenkins for and When to Use It
+
+Use Jenkins to automate your development workflow, so you can focus on work that matters most. Jenkins is commonly used for:
+
+- Building projects
+- Running tests to detect bugs and other issues as soon as they are introduced
+- Static code analysis
+- Deployment
+
+Execute repetitive tasks, save time, and optimize your development process with Jenkins.
+
+# Downloads
+
+The Jenkins project provides official distributions as WAR files, Docker images, native packages and installers for platforms including several Linux distributions and Windows.
+See the [Downloads](https://www.jenkins.io/download) page for references.
+
+For all distributions Jenkins offers two release lines:
+
+- [Weekly](https://www.jenkins.io/download/weekly/) -
+ Frequent releases which include all new features, improvements, and bug fixes.
+- [Long-Term Support (LTS)](https://www.jenkins.io/download/lts/) -
+ Older release line which gets periodically updated via bug fix backports.
+
+Latest releases:
+[](https://www.jenkins.io/changelog)
+[](https://www.jenkins.io/changelog-stable)
+
+# Source
+
+Our latest and greatest source of Jenkins can be found on [GitHub](https://github.com/jenkinsci/jenkins). Fork us!
+
+# Contributing to Jenkins
+
+Follow the [contributing guidelines](CONTRIBUTING.md) if you want to propose a change in the Jenkins core.
+For more information about participating in the community and contributing to the Jenkins project,
+see [this page](https://www.jenkins.io/participate/).
+
+Documentation for Jenkins core maintainers is in the [maintainers guidelines](docs/MAINTAINERS.adoc).
+
+# News and Website
+
+All information about Jenkins can be found on our [website](https://www.jenkins.io/).
+Follow us on [Twitter](https://twitter.com/jenkinsci) or [LinkedIn](https://www.linkedin.com/company/jenkins-project/).
+
+# Governance
+
+See the [Jenkins Governance Document](https://www.jenkins.io/project/governance/) for information about the project's open governance, our philosophy and values, and development practices.
+Jenkins Code of Conduct can be found [here](https://www.jenkins.io/project/conduct/).
+
+# Adopters
+
+Jenkins is used by millions of users and thousands of companies.
+See [adopters](https://www.jenkins.io/project/adopters/) for the list of Jenkins adopters and their success stories.
+
+# License
+
+Jenkins is **licensed** under the **[MIT License](https://github.com/jenkinsci/jenkins/blob/master/LICENSE.txt)**.
diff --git a/apps/jenkins/versions/2.391/config.json b/apps/jenkins/versions/2.391/config.json
new file mode 100644
index 00000000..a298d602
--- /dev/null
+++ b/apps/jenkins/versions/2.391/config.json
@@ -0,0 +1,12 @@
+{
+ "formFields": [
+ {
+ "type": "number",
+ "labelZh": "端口",
+ "labelEn": "Port",
+ "required": true,
+ "default": 8080,
+ "envKey": "PANEL_APP_PORT_HTTP"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/apps/jenkins/versions/2.391/docker-compose.yml b/apps/jenkins/versions/2.391/docker-compose.yml
new file mode 100644
index 00000000..3a68907c
--- /dev/null
+++ b/apps/jenkins/versions/2.391/docker-compose.yml
@@ -0,0 +1,20 @@
+version: '3'
+services:
+ jenkins:
+ container_name: ${CONTAINER_NAME}
+ image: jenkins/jenkins:2.391
+ restart: unless-stopped
+ privileged: true
+ user: root
+ ports:
+ - ${PANEL_APP_PORT_HTTP}:8080
+ volumes:
+ - ./jenkins:/var/jenkins_home
+ - /var/run/docker.sock:/var/run/docker.sock
+ - /usr/local/bin/docker:/usr/local/bin/docker
+ networks:
+ - 1panel-network
+
+networks:
+ 1panel-network:
+ external: true
diff --git a/apps/list.json b/apps/list.json
index a3a898f2..22be89f2 100644
--- a/apps/list.json
+++ b/apps/list.json
@@ -16,6 +16,10 @@
{
"key": "Tool",
"name": "工具"
+ },
+ {
+ "key": "CI/CD",
+ "name": "CI/CD"
}
],
"items": [
@@ -36,7 +40,7 @@
"document": "https://dev.mysql.com/doc/"
},
{
- "key": "nginx",
+ "key": "openresty",
"name": "OpenResty",
"tags": ["Server"],
"versions": ["1.21.4"],
@@ -158,6 +162,51 @@
"website": "https://dataease.io/",
"github": "https://github.com/dataease/dataease",
"document": "https://dataease.io/docs/"
+ },
+ {
+ "key": "jenkins",
+ "name": "Jenkins",
+ "tags": ["CI/CD"],
+ "versions": ["2.391"],
+ "shortDescZh": "构建伟大，无所不能",
+ "shortDescEn": "Build great things at any scale",
+ "type": "tool",
+ "required": [],
+ "limit": 1,
+ "crossVersionUpdate": false,
+ "website": "https://www.jenkins.io/",
+ "github": "https://github.com/jenkinsci/jenkins",
+ "document": "https://www.jenkins.io/doc/book/"
+ },
+ {
+ "key": "gitlab",
+ "name": "GitLab",
+ "tags": ["CI/CD"],
+ "versions": ["15.8.3"],
+ "shortDescZh": "项目管理和代码托管平台",
+ "shortDescEn": "Project management and code hosting platform",
+ "type": "tool",
+ "required": [],
+ "limit": 1,
+ "crossVersionUpdate": false,
+ "website": "https://about.gitlab.com/",
+ "github": "https://github.com/gitlabhq/gitlabhq",
+ "document": "https://docs.gitlab.com/"
+ },
+ {
+ "key": "postgresql",
+ "name": "PostgreSQL",
+ "tags": ["Database"],
+ "versions": ["15.2-alpine"],
+ "shortDescZh": "开源关系型数据库",
+ "shortDescEn": "Open Source Relational Database",
+ "type": "runtime",
+ "required": [],
+ "limit": 1,
+ "crossVersionUpdate": false,
+ "website": "https://about.gitlab.com/",
+ "github": "https://github.com/postgres/postgres",
+ "document": "https://docs.gitlab.com/"
}
]
}
\ No newline at end of file
diff --git a/apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/docker-compose.yml b/apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/docker-compose.yml
index adbfde92..67d0df45 100644
--- a/apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/docker-compose.yml
+++ b/apps/minio/versions/RELEASE.2022-08-13T21-54-44Z/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
services:
minio:
image: minio/minio:RELEASE.2022-08-13T21-54-44Z
- container_name: 1panel_minio
+ container_name: ${CONTAINER_NAME}
ports:
- ${PANEL_APP_PORT_HTTP}:9000
- ${PORT_API}:9001
diff --git a/apps/mysql/versions/8.0.30/docker-compose.yml b/apps/mysql/versions/8.0.30/docker-compose.yml
index 35ae46c2..240765f0 100644
--- a/apps/mysql/versions/8.0.30/docker-compose.yml
+++ b/apps/mysql/versions/8.0.30/docker-compose.yml
@@ -17,7 +17,6 @@ services:
- ./log:/var/log/mysql
labels:
createdBy: "Apps"
-
command:
- --default-authentication-plugin=mysql_native_password
diff --git a/apps/nginx/metadata/logo.png b/apps/nginx/metadata/logo.png
deleted file mode 100644
index e4ccafda..00000000
Binary files a/apps/nginx/metadata/logo.png and /dev/null differ
diff --git a/apps/openresty/metadata/logo.png b/apps/openresty/metadata/logo.png
new file mode 100644
index 00000000..a2caa14d
Binary files /dev/null and b/apps/openresty/metadata/logo.png differ
diff --git a/apps/nginx/versions/1.21.4/README.md b/apps/openresty/versions/1.21.4/README.md
similarity index 100%
rename from apps/nginx/versions/1.21.4/README.md
rename to apps/openresty/versions/1.21.4/README.md
diff --git a/apps/nginx/versions/1.21.4/conf/conf.d/default.conf b/apps/openresty/versions/1.21.4/conf/conf.d/default.conf
similarity index 100%
rename from apps/nginx/versions/1.21.4/conf/conf.d/default.conf
rename to apps/openresty/versions/1.21.4/conf/conf.d/default.conf
diff --git a/apps/nginx/versions/1.21.4/conf/mime.types b/apps/openresty/versions/1.21.4/conf/mime.types
similarity index 100%
rename from apps/nginx/versions/1.21.4/conf/mime.types
rename to apps/openresty/versions/1.21.4/conf/mime.types
diff --git a/apps/nginx/versions/1.21.4/conf/nginx.conf b/apps/openresty/versions/1.21.4/conf/nginx.conf
similarity index 100%
rename from apps/nginx/versions/1.21.4/conf/nginx.conf
rename to apps/openresty/versions/1.21.4/conf/nginx.conf
diff --git a/apps/nginx/versions/1.21.4/config.json b/apps/openresty/versions/1.21.4/config.json
similarity index 100%
rename from apps/nginx/versions/1.21.4/config.json
rename to apps/openresty/versions/1.21.4/config.json
diff --git a/apps/nginx/versions/1.21.4/docker-compose.yml b/apps/openresty/versions/1.21.4/docker-compose.yml
similarity index 91%
rename from apps/nginx/versions/1.21.4/docker-compose.yml
rename to apps/openresty/versions/1.21.4/docker-compose.yml
index bb6e4c1b..b30e3333 100644
--- a/apps/nginx/versions/1.21.4/docker-compose.yml
+++ b/apps/openresty/versions/1.21.4/docker-compose.yml
@@ -2,6 +2,7 @@ version: '3'
services:
openresty:
image: openresty/openresty:1.21.4.1-3-alpine
+ container_name: ${CONTAINER_NAME}
restart: always
network_mode: host
volumes:
diff --git a/apps/nginx/versions/1.21.4/root/index.html b/apps/openresty/versions/1.21.4/root/index.html
similarity index 100%
rename from apps/nginx/versions/1.21.4/root/index.html
rename to apps/openresty/versions/1.21.4/root/index.html
diff --git a/apps/nginx/versions/1.21.4/root/stop/index.html b/apps/openresty/versions/1.21.4/root/stop/index.html
similarity index 100%
rename from apps/nginx/versions/1.21.4/root/stop/index.html
rename to apps/openresty/versions/1.21.4/root/stop/index.html
diff --git a/apps/nginx/versions/1.21.4/www/common/waf/access.lua b/apps/openresty/versions/1.21.4/www/common/waf/access.lua
similarity index 100%
rename from apps/nginx/versions/1.21.4/www/common/waf/access.lua
rename to apps/openresty/versions/1.21.4/www/common/waf/access.lua
diff --git a/apps/nginx/versions/1.21.4/www/common/waf/init.lua b/apps/openresty/versions/1.21.4/www/common/waf/init.lua
similarity index 100%
rename from apps/nginx/versions/1.21.4/www/common/waf/init.lua
rename to apps/openresty/versions/1.21.4/www/common/waf/init.lua
diff --git a/apps/nginx/versions/1.21.4/www/common/waf/rules/args_check.json b/apps/openresty/versions/1.21.4/www/common/waf/rules/args_check.json
similarity index 100%
rename from apps/nginx/versions/1.21.4/www/common/waf/rules/args_check.json
rename to apps/openresty/versions/1.21.4/www/common/waf/rules/args_check.json
diff --git a/apps/nginx/versions/1.21.4/www/common/waf/rules/cc.json b/apps/openresty/versions/1.21.4/www/common/waf/rules/cc.json
similarity index 100%
rename from apps/nginx/versions/1.21.4/www/common/waf/rules/cc.json
rename to apps/openresty/versions/1.21.4/www/common/waf/rules/cc.json
diff --git a/apps/nginx/versions/1.21.4/www/common/waf/rules/cookie_block.json b/apps/openresty/versions/1.21.4/www/common/waf/rules/cookie_block.json
similarity index 100%
rename from apps/nginx/versions/1.21.4/www/common/waf/rules/cookie_block.json
rename to apps/openresty/versions/1.21.4/www/common/waf/rules/cookie_block.json
diff --git a/apps/nginx/versions/1.21.4/www/common/waf/rules/file_ext_block.json b/apps/openresty/versions/1.21.4/www/common/waf/rules/file_ext_block.json
similarity index 100%
rename from apps/nginx/versions/1.21.4/www/common/waf/rules/file_ext_block.json
rename to apps/openresty/versions/1.21.4/www/common/waf/rules/file_ext_block.json
diff --git a/apps/nginx/versions/1.21.4/www/common/waf/rules/html b/apps/openresty/versions/1.21.4/www/common/waf/rules/html
similarity index 100%
rename from apps/nginx/versions/1.21.4/www/common/waf/rules/html
rename to apps/openresty/versions/1.21.4/www/common/waf/rules/html
diff --git a/apps/nginx/versions/1.21.4/www/common/waf/rules/ip_block.json b/apps/openresty/versions/1.21.4/www/common/waf/rules/ip_block.json
similarity index 100%
rename from apps/nginx/versions/1.21.4/www/common/waf/rules/ip_block.json
rename to apps/openresty/versions/1.21.4/www/common/waf/rules/ip_block.json
diff --git a/apps/nginx/versions/1.21.4/www/common/waf/rules/ip_white.json b/apps/openresty/versions/1.21.4/www/common/waf/rules/ip_white.json
similarity index 100%
rename from apps/nginx/versions/1.21.4/www/common/waf/rules/ip_white.json
rename to apps/openresty/versions/1.21.4/www/common/waf/rules/ip_white.json
diff --git a/apps/nginx/versions/1.21.4/www/common/waf/rules/post_check.json b/apps/openresty/versions/1.21.4/www/common/waf/rules/post_check.json
similarity index 100%
rename from apps/nginx/versions/1.21.4/www/common/waf/rules/post_check.json
rename to apps/openresty/versions/1.21.4/www/common/waf/rules/post_check.json
diff --git a/apps/nginx/versions/1.21.4/www/common/waf/rules/url_block.json b/apps/openresty/versions/1.21.4/www/common/waf/rules/url_block.json
similarity index 100%
rename from apps/nginx/versions/1.21.4/www/common/waf/rules/url_block.json
rename to apps/openresty/versions/1.21.4/www/common/waf/rules/url_block.json
diff --git a/apps/nginx/versions/1.21.4/www/common/waf/rules/url_white.json b/apps/openresty/versions/1.21.4/www/common/waf/rules/url_white.json
similarity index 100%
rename from apps/nginx/versions/1.21.4/www/common/waf/rules/url_white.json
rename to apps/openresty/versions/1.21.4/www/common/waf/rules/url_white.json
diff --git a/apps/nginx/versions/1.21.4/www/common/waf/rules/user_agent.json b/apps/openresty/versions/1.21.4/www/common/waf/rules/user_agent.json
similarity index 100%
rename from apps/nginx/versions/1.21.4/www/common/waf/rules/user_agent.json
rename to apps/openresty/versions/1.21.4/www/common/waf/rules/user_agent.json
diff --git a/apps/phpmyadmin/versions/5.2.0/docker-compose.yml b/apps/phpmyadmin/versions/5.2.0/docker-compose.yml
index 5ef7de26..bf2ff751 100644
--- a/apps/phpmyadmin/versions/5.2.0/docker-compose.yml
+++ b/apps/phpmyadmin/versions/5.2.0/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
services:
phpmyadmin:
image: phpmyadmin/phpmyadmin:5.2.0
- container_name: 1panel_phpmyadmin
+ container_name: ${CONTAINER_NAME}
ports:
- ${PANEL_APP_PORT_HTTP}:80
environment:
diff --git a/apps/postgresql/metadata/logo.png b/apps/postgresql/metadata/logo.png
new file mode 100644
index 00000000..fd9c7ec2
Binary files /dev/null and b/apps/postgresql/metadata/logo.png differ
diff --git a/apps/postgresql/versions/15.2-alpine/README.md b/apps/postgresql/versions/15.2-alpine/README.md
new file mode 100644
index 00000000..6416a8cf
--- /dev/null
+++ b/apps/postgresql/versions/15.2-alpine/README.md
@@ -0,0 +1,27 @@
+PostgreSQL Database Management System
+=====================================
+
+This directory contains the source code distribution of the PostgreSQL
+database management system.
+
+PostgreSQL is an advanced object-relational database management system
+that supports an extended subset of the SQL standard, including
+transactions, foreign keys, subqueries, triggers, user-defined types
+and functions. This distribution also contains C language bindings.
+
+PostgreSQL has many language interfaces, many of which are listed here:
+
+ https://www.postgresql.org/download/
+
+See the file INSTALL for instructions on how to build and install
+PostgreSQL. That file also lists supported operating systems and
+hardware platforms and contains information regarding any other
+software packages that are required to build or run the PostgreSQL
+system. Copyright and license information can be found in the
+file COPYRIGHT. A comprehensive documentation set is included in this
+distribution; it can be read as described in the installation
+instructions.
+
+The latest version of this software may be obtained at
+https://www.postgresql.org/download/. For more information look at our
+web site located at https://www.postgresql.org/.
diff --git a/apps/postgresql/versions/15.2-alpine/config.json b/apps/postgresql/versions/15.2-alpine/config.json
new file mode 100644
index 00000000..d6fae715
--- /dev/null
+++ b/apps/postgresql/versions/15.2-alpine/config.json
@@ -0,0 +1,28 @@
+{
+ "formFields": [
+ {
+ "type": "text",
+ "labelZh": "用户名",
+ "labelEn": "Username",
+ "required": true,
+ "default": "random",
+ "envKey": "PANEL_DB_USER"
+ },
+ {
+ "type": "password",
+ "labelZh": "用户密码",
+ "labelEn": "Password",
+ "required": true,
+ "default": "random",
+ "envKey": "PANEL_DB_ROOT_PASSWORD"
+ },
+ {
+ "type": "number",
+ "labelZh": "端口",
+ "labelEn": "Port",
+ "required": true,
+ "default": 5432,
+ "envKey": "PANEL_APP_PORT_HTTP"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/apps/postgresql/versions/15.2-alpine/docker-compose.yml b/apps/postgresql/versions/15.2-alpine/docker-compose.yml
new file mode 100644
index 00000000..f259ae64
--- /dev/null
+++ b/apps/postgresql/versions/15.2-alpine/docker-compose.yml
@@ -0,0 +1,19 @@
+version: '3'
+services:
+ postgres:
+ container_name: ${CONTAINER_NAME}
+ image: postgres:15.2-alpine
+ restart: always
+ environment:
+ - POSTGRES_USER=${PANEL_DB_USER}
+ - POSTGRES_PASSWORD=${PANEL_DB_ROOT_PASSWORD}
+ ports:
+ - ${PANEL_APP_PORT_HTTP}:5432
+ volumes:
+ - ./data:/var/lib/postgresql/data
+ networks:
+ - 1panel-network
+
+networks:
+ 1panel-network:
+ external: true
diff --git a/apps/redis-commander/versions/0.8.0/docker-compose.yml b/apps/redis-commander/versions/0.8.0/docker-compose.yml
index 1bdfb4a4..5a9c6f09 100644
--- a/apps/redis-commander/versions/0.8.0/docker-compose.yml
+++ b/apps/redis-commander/versions/0.8.0/docker-compose.yml
@@ -1,7 +1,7 @@
version: '3'
services:
redis-commander:
- container_name: redis-commander
+ container_name: ${CONTAINER_NAME}
hostname: redis-commander
image: rediscommander/redis-commander:latest
restart: always
diff --git a/apps/redis/versions/6.0.16/docker-compose.yml b/apps/redis/versions/6.0.16/docker-compose.yml
index 6de98f1f..6239e0ad 100644
--- a/apps/redis/versions/6.0.16/docker-compose.yml
+++ b/apps/redis/versions/6.0.16/docker-compose.yml
@@ -3,6 +3,7 @@ services:
redis:
image: redis:6.0.16
restart: always
+ container_name: ${CONTAINER_NAME}
networks:
- 1panel-network
ports:
diff --git a/apps/redis/versions/7.0.5/docker-compose.yml b/apps/redis/versions/7.0.5/docker-compose.yml
index 4f7a3e94..3d001b2c 100644
--- a/apps/redis/versions/7.0.5/docker-compose.yml
+++ b/apps/redis/versions/7.0.5/docker-compose.yml
@@ -3,6 +3,7 @@ services:
redis:
image: redis:7.0.5
restart: always
+ container_name: ${CONTAINER_NAME}
networks:
- 1panel-network
ports:
-
-
+