diff --git a/.github/workflows/v2-ui.yml b/.github/workflows/v2-ui.yml index 73e0a0e..e8221ad 100644 --- a/.github/workflows/v2-ui.yml +++ b/.github/workflows/v2-ui.yml @@ -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 }} + diff --git a/v2-ui/README.md b/v2-ui/README.md index e0ec04d..08ec86c 100644 --- a/v2-ui/README.md +++ b/v2-ui/README.md @@ -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 diff --git a/v2-ui-ssl/README.md b/v2-ui/v2-ui-ssl/README.md similarity index 96% rename from v2-ui-ssl/README.md rename to v2-ui/v2-ui-ssl/README.md index b044c85..24abafe 100644 --- a/v2-ui-ssl/README.md +++ b/v2-ui/v2-ui-ssl/README.md @@ -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 ``` diff --git a/v2-ui-ssl/conf/account.conf b/v2-ui/v2-ui-ssl/conf/account.conf similarity index 100% rename from v2-ui-ssl/conf/account.conf rename to v2-ui/v2-ui-ssl/conf/account.conf diff --git a/v2-ui-ssl/conf/acme.sh b/v2-ui/v2-ui-ssl/conf/acme.sh similarity index 100% rename from v2-ui-ssl/conf/acme.sh rename to v2-ui/v2-ui-ssl/conf/acme.sh diff --git a/v2-ui-ssl/conf/start.sh b/v2-ui/v2-ui-ssl/conf/start.sh similarity index 100% rename from v2-ui-ssl/conf/start.sh rename to v2-ui/v2-ui-ssl/conf/start.sh diff --git a/v2-ui-ssl/data/v2-ui.db b/v2-ui/v2-ui-ssl/data/v2-ui.db similarity index 100% rename from v2-ui-ssl/data/v2-ui.db rename to v2-ui/v2-ui-ssl/data/v2-ui.db diff --git a/v2-ui-ssl/docker-compose.yml b/v2-ui/v2-ui-ssl/docker-compose.yml similarity index 100% rename from v2-ui-ssl/docker-compose.yml rename to v2-ui/v2-ui-ssl/docker-compose.yml diff --git a/v2-ui-ssl/install.sh b/v2-ui/v2-ui-ssl/install.sh similarity index 98% rename from v2-ui-ssl/install.sh rename to v2-ui/v2-ui-ssl/install.sh index 793167d..c88436e 100755 --- a/v2-ui-ssl/install.sh +++ b/v2-ui/v2-ui-ssl/install.sh @@ -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<