Optimize v2-ui
This commit is contained in:
parent
b3a5c3ae92
commit
faba09df06
|
@ -1,7 +1,7 @@
|
|||
name: "v2-ui docker build"
|
||||
|
||||
env:
|
||||
PROJECT: v2-ui
|
||||
PROJECT: v2-ui
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
@ -9,16 +9,18 @@ on:
|
|||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
- name: Set tag
|
||||
id: tag
|
||||
run: |
|
||||
TAG=$(cat ${{ env.PROJECT }}/Dockerfile | awk 'NR==4 {print $3}')
|
||||
echo "::set-env name=TAG::$TAG"
|
||||
if [[ -n $(cat ${{ env.PROJECT }}/Dockerfile | awk '{if($2~"VERSION")print $3}') ]]; then
|
||||
VERSION=$(cat ${{ env.PROJECT }}/Dockerfile | awk '{if($2~"VERSION")print $3}')
|
||||
echo "tag=$VERSION" >> $GITHUB_ENV
|
||||
else
|
||||
echo "tag=$(date +%Y)-$(date +%m)-$(date +%d)" >> $GITHUB_ENV
|
||||
fi
|
||||
- name: Docker Hub login
|
||||
env:
|
||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||
|
@ -39,4 +41,5 @@ jobs:
|
|||
--output "type=image,push=true" \
|
||||
--file ${{ env.PROJECT }}/Dockerfile ./${{ env.PROJECT }} \
|
||||
--tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/${{ env.PROJECT }}:latest \
|
||||
--tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/${{ env.PROJECT }}:${TAG}
|
||||
--tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/${{ env.PROJECT }}:${{ env.tag }}
|
||||
|
||||
|
|
|
@ -11,17 +11,10 @@ Docker [stilleshan/v2-ui](https://hub.docker.com/r/stilleshan/v2-ui)
|
|||
- **2021-06-17** 更新`一键安装脚本`.
|
||||
- **2021-06-13** 更新`5.5.2`版 docker 镜像,新增同时支持 X86 和 ARM 架构.
|
||||
|
||||
## 一键安装脚本部署
|
||||
- 使用一键安装脚本后无需继续参考以下`手动部署`段落.
|
||||
- 脚本依旧需要基于本服务器安装 docker 和 docker compose 环境.
|
||||
- 脚本仅限于首次使用,确保服务器之前没有使用过本仓库的`v2-ui`或`v2-ui-ssl`项目.
|
||||
- 脚本安装完毕后,会自行删除,避免误操作.
|
||||
- 脚本安装完毕后,依旧需要参考 [自动更新证书](https://github.com/stilleshan/dockerfiles/tree/main/v2-ui-ssl#%E8%87%AA%E5%8A%A8%E6%9B%B4%E6%96%B0%E8%AF%81%E4%B9%A6) 段落手动执行定时任务操作,以便`v2-ui`定时重启使得证书生效.
|
||||
```shell
|
||||
wget https://raw.githubusercontent.com/stilleshan/dockerfiles/main/v2-ui-ssl/install.sh && chmod +x install.sh && ./install.sh
|
||||
```
|
||||
## v2-ui-ssl 一键安装脚本部署
|
||||
一键安装脚本部署请访问子目录 [v2-ui-ssl](./v2-ui-ssl) 查看详情.
|
||||
|
||||
## 手动部署
|
||||
## v2-ui 手动部署
|
||||
### docker
|
||||
```shell
|
||||
docker run -d --name=v2-ui --restart=always --network=host stilleshan/v2-ui
|
||||
|
|
|
@ -20,7 +20,7 @@ Docker [stilleshan/v2-ui](https://hub.docker.com/r/stilleshan/v2-ui)
|
|||
- 脚本安装完毕后,会自行删除,避免误操作.
|
||||
- 脚本安装完毕后,依旧需要手动执行以下`自动更新证书`段落的操作,以便`v2-ui`定时重启使得证书生效.
|
||||
```shell
|
||||
wget https://raw.githubusercontent.com/stilleshan/dockerfiles/main/v2-ui-ssl/install.sh && chmod +x install.sh && ./install.sh
|
||||
wget https://raw.githubusercontent.com/stilleshan/dockerfiles/main/v2-ui/v2-ui-ssl/install.sh && chmod +x install.sh && ./install.sh
|
||||
```
|
||||
|
||||
|
||||
|
@ -28,7 +28,7 @@ wget https://raw.githubusercontent.com/stilleshan/dockerfiles/main/v2-ui-ssl/ins
|
|||
### 下载文件
|
||||
部署所需文件已打包,方便直接下载解压使用.
|
||||
```shell
|
||||
wget https://raw.githubusercontent.com/stilleshan/dockerfiles/main/v2-ui-ssl/v2-ui-ssl.tar
|
||||
wget https://raw.githubusercontent.com/stilleshan/dockerfiles/main/v2-ui/v2-ui-ssl/v2-ui-ssl.tar
|
||||
tar -xvf v2-ui-ssl.tar
|
||||
cd v2-ui-ssl
|
||||
```
|
|
@ -120,7 +120,7 @@ case "$START_INPUT" in
|
|||
|
||||
accout_conf (){
|
||||
WORK_PATH=$(dirname $(readlink -f $0))
|
||||
wget https://raw.githubusercontent.com/stilleshan/dockerfiles/main/v2-ui-ssl/v2-ui-ssl.tar
|
||||
wget https://raw.githubusercontent.com/stilleshan/dockerfiles/main/v2-ui/v2-ui-ssl/v2-ui-ssl.tar
|
||||
tar -xvf v2-ui-ssl.tar
|
||||
cat >${WORK_PATH}/v2-ui-ssl/conf/account.conf<<EOF
|
||||
export ${API_ID_HEADER}="${API_ID_INPUT}"
|
||||
|
@ -146,7 +146,7 @@ docker_compose_ssl (){
|
|||
|
||||
docker_compose_nossl (){
|
||||
WORK_PATH=$(dirname $(readlink -f $0))
|
||||
wget https://raw.githubusercontent.com/stilleshan/dockerfiles/main/v2-ui-ssl/v2-ui-ssl.tar
|
||||
wget https://raw.githubusercontent.com/stilleshan/dockerfiles/main/v2-ui/v2-ui-ssl/v2-ui-ssl.tar
|
||||
tar -xvf v2-ui-ssl.tar
|
||||
sed -i '8d' ${WORK_PATH}/v2-ui-ssl/docker-compose.yml
|
||||
sed -i '11,20d' ${WORK_PATH}/v2-ui-ssl/docker-compose.yml
|
Loading…
Reference in New Issue