From d696053ee9852da6924615810d922a9f094c88ba Mon Sep 17 00:00:00 2001
From: qiaofeng1227 <76487013@qq.com>
Date: Wed, 20 Sep 2023 08:47:52 +0800
Subject: [PATCH] apphub

---
 .github/workflows/build_apphub.yml     | 8 ++++----
 .github/workflows/build_deployment.yml | 8 ++++----
 .github/workflows/build_git.yml        | 8 ++++----
 docker/apphub/Dockerfile               | 1 -
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build_apphub.yml b/.github/workflows/build_apphub.yml
index 14744aa7..8032260c 100644
--- a/.github/workflows/build_apphub.yml
+++ b/.github/workflows/build_apphub.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [main]
     paths:
-      - "docker/w9apphub/Dockerfile"
+      - "docker/apphub/Dockerfile"
 
 jobs:
   build:
@@ -18,7 +18,7 @@ jobs:
 
       - name: Get version
         run: |
-          version=$(grep -Po '(?<=LABEL version=").*?(?=")' docker/w9apphub/Dockerfile)
+          version=$(grep -Po '(?<=LABEL version=").*?(?=")' docker/apphub/Dockerfile)
           echo $version
           echo "::set-output name=version::$version"
           echo "VERSION=$version" >> $GITHUB_ENV
@@ -30,8 +30,8 @@ jobs:
           tags: ${{ env.VERSION }}
           addLatest: True
           registry: docker.io
-          dockerfile: docker/w9apphub/Dockerfile
-          directory: docker/w9apphub
+          dockerfile: docker/apphub/Dockerfile
+          directory: docker/apphub
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
diff --git a/.github/workflows/build_deployment.yml b/.github/workflows/build_deployment.yml
index d56e45ff..95c34801 100644
--- a/.github/workflows/build_deployment.yml
+++ b/.github/workflows/build_deployment.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [main]
     paths:
-      - "docker/w9deployment/Dockerfile"
+      - "docker/deployment/Dockerfile"
 
 jobs:
   build:
@@ -18,7 +18,7 @@ jobs:
 
       - name: Get version
         run: |
-          version=$(grep -Po '(?<=LABEL version=").*?(?=")' docker/w9deployment/Dockerfile)
+          version=$(grep -Po '(?<=LABEL version=").*?(?=")' docker/deployment/Dockerfile)
           echo $version
           echo "::set-output name=version::$version"
           echo "VERSION=$version" >> $GITHUB_ENV
@@ -30,7 +30,7 @@ jobs:
           tags: ${{ env.VERSION }}
           addLatest: True
           registry: docker.io
-          dockerfile: docker/w9deployment/Dockerfile
-          directory: docker/w9deployment
+          dockerfile: docker/deployment/Dockerfile
+          directory: docker/deployment
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/.github/workflows/build_git.yml b/.github/workflows/build_git.yml
index 129a7cd2..901d4fef 100644
--- a/.github/workflows/build_git.yml
+++ b/.github/workflows/build_git.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [main]
     paths:
-      - "docker/w9git/Dockerfile"
+      - "docker/git/Dockerfile"
 
 jobs:
   build:
@@ -18,7 +18,7 @@ jobs:
 
       - name: Get version
         run: |
-          version=$(grep -Po '(?<=LABEL version=").*?(?=")' docker/w9git/Dockerfile)
+          version=$(grep -Po '(?<=LABEL version=").*?(?=")' docker/git/Dockerfile)
           echo $version
           echo "::set-output name=version::$version"
           echo "VERSION=$version" >> $GITHUB_ENV
@@ -30,7 +30,7 @@ jobs:
           tags: ${{ env.VERSION }}
           addLatest: True
           registry: docker.io
-          dockerfile: docker/w9git/Dockerfile
-          directory: docker/w9git
+          dockerfile: docker/git/Dockerfile
+          directory: docker/git
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
diff --git a/docker/apphub/Dockerfile b/docker/apphub/Dockerfile
index 58bd2bda..8f5d4b90 100644
--- a/docker/apphub/Dockerfile
+++ b/docker/apphub/Dockerfile
@@ -32,7 +32,6 @@ RUN pip install --upgrade pip && pip install -r apphub/requirements.txt
 RUN pip install supervisor
 COPY config/supervisord.conf /usr/local/supervisord.conf
 RUN chmod +r /usr/local/supervisord.conf
-
 COPY config/entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh