chore: update shell

bingo-project · Mar 23, 2024 · 76c4446 · 76c4446
1 parent c9c41c3
commit 76c4446
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 27 deletions.
diff --git a/.github/workflows/prod.yaml b/.github/workflows/prod.yaml
@@ -117,15 +117,16 @@ jobs:
           username: ${{ secrets.REMOTE_USER }}
           key: ${{ secrets.REMOTE_KEY }}
           script: |
-            mkdir -p /opt/bingo
-            cd /opt/bingo || exit
+            app_name=bingo
+            mkdir -p /opt/${app_name}
+            cd /opt/${app_name} || exit
             
-            tar -xzvpf /tmp/bingo-docker.tar.gz -C ./
+            tar -xzvpf /tmp/${app_name}-docker.tar.gz -C ./
             if [ ! -f .env ]; then
               cp .env.example .env
             fi
-            if [ ! -f config/bingo-apiserver.yaml ]; then
-              cp config/bingo-apiserver.example.yaml config/bingo-apiserver.yaml
+            if [ ! -f config/${app_name}-apiserver.yaml ]; then
+              cp config/${app_name}-apiserver.example.yaml config/${app_name}-apiserver.yaml
             fi
             if [ ! -f config/promtail.yaml ]; then
               cp config/promtail.example.yaml config/promtail.yaml
@@ -136,9 +137,15 @@ jobs:
               sed -i "s/APP_VERSION=.*/APP_VERSION=${{ env.VERSION }}/g" .env
             fi
             
-            docker load </tmp/bingo-images.tar.gz
+            # Load and tag latest
+            loaded=$(docker load </tmp/${app_name}-images.tar.gz)
+            for image_with_version in $(echo "$loaded" | awk -F ': ' '{print $2}'); do
+              image=${image_with_version%:*}
+              docker tag "$image_with_version" "$image":latest
+            done
+            
             docker-compose up -d
             
-            rm /tmp/bingo*.tar.gz
-            rm config/bingo-apiserver.example.yaml
+            rm /tmp/${app_name}*.tar.gz
+            rm config/${app_name}-apiserver.example.yaml
             rm config/promtail.example.yaml
diff --git a/.github/workflows/staging.yaml b/.github/workflows/staging.yaml
@@ -71,7 +71,7 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: bingo
+          name: ${app_name}
           path: |
             _output/*tar.gz
 
@@ -96,7 +96,7 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          name: bingo
+          name: ${app_name}
           path: ./
 
       - name: Display structure of downloaded files
@@ -119,15 +119,16 @@ jobs:
           username: ${{ secrets.REMOTE_USER }}
           key: ${{ secrets.REMOTE_KEY }}
           script: |
-            mkdir -p /opt/bingo
-            cd /opt/bingo || exit
+            app_name=bingo
+            mkdir -p /opt/${app_name}
+            cd /opt/${app_name} || exit
           
-            tar -xzvpf /tmp/bingo-docker.tar.gz -C ./
+            tar -xzvpf /tmp/${app_name}-docker.tar.gz -C ./
             if [ ! -f .env ]; then
               cp .env.example .env
             fi
-            if [ ! -f config/bingo-apiserver.yaml ]; then
-              cp config/bingo-apiserver.example.yaml config/bingo-apiserver.yaml
+            if [ ! -f config/${app_name}-apiserver.yaml ]; then
+              cp config/${app_name}-apiserver.example.yaml config/${app_name}-apiserver.yaml
             fi
             if [ ! -f config/promtail.yaml ]; then
               cp config/promtail.example.yaml config/promtail.yaml
@@ -139,14 +140,14 @@ jobs:
             fi
           
             # Load and tag latest
-            loaded=$(docker load </tmp/bingo-images.tar.gz)
+            loaded=$(docker load </tmp/${app_name}-images.tar.gz)
             for image_with_version in $(echo "$loaded" | awk -F ': ' '{print $2}'); do
               image=${image_with_version%:*}
               docker tag "$image_with_version" "$image":latest
             done
   
             docker-compose up -d
 
-            rm /tmp/bingo*.tar.gz
-            rm config/bingo-apiserver.example.yaml
+            rm /tmp/${app_name}*.tar.gz
+            rm config/${app_name}-apiserver.example.yaml
             rm config/promtail.example.yaml
diff --git a/build/docker/docker-compose.yaml b/build/docker/docker-compose.yaml
@@ -49,7 +49,7 @@ services:
       - ${DATA_PATH_HOST}/log/bot:/opt/bingo/storage/log
 
   # add alias to zsh to run bingoctl cmd.
-  # alias bingoctl="docker run --rm -v /path/to/config:/etc/bingo --network bingo_bingo bingoctl:{tag}"
+  # alias bingoctl="docker run --rm -v /path/to/config:/etc/bingo --network bingo_bingo bingoctl"
   bingoctl:
     image: ${APP_NAME}ctl:${APP_VERSION}
     container_name: ${APP_NAME}ctl

diff --git a/scripts/docker/run.sh b/scripts/docker/run.sh
@@ -4,15 +4,16 @@
 tag=$1
 
 run() {
-  mkdir -p /opt/bingo
-  cd /opt/bingo || exit
+  app_name=bingo
+  mkdir -p /opt/${app_name}
+  cd /opt/${app_name} || exit
 
-  tar -xzvpf /tmp/bingo-docker.tar.gz -C ./
+  tar -xzvpf /tmp/${app_name}-docker.tar.gz -C ./
   if [ ! -f .env ]; then
     cp .env.example .env
   fi
-  if [ ! -f config/bingo-apiserver.yaml ]; then
-    cp config/bingo-apiserver.example.yaml config/bingo-apiserver.yaml
+  if [ ! -f config/${app_name}-apiserver.yaml ]; then
+    cp config/${app_name}-apiserver.example.yaml config/${app_name}-apiserver.yaml
   fi
   if [ ! -f config/promtail.yaml ]; then
     cp config/promtail.example.yaml config/promtail.yaml
@@ -24,16 +25,16 @@ run() {
   fi
 
   # Load and tag latest
-  loaded=$(docker load </tmp/bingo-images.tar.gz)
+  loaded=$(docker load </tmp/${app_name}-images.tar.gz)
   for image_with_version in $(echo "$loaded" | awk -F ': ' '{print $2}'); do
     image=${image_with_version%:*}
     docker tag "$image_with_version" "$image":latest
   done
 
   docker-compose up -d
 
-  rm /tmp/bingo*.tar.gz
-  rm config/bingo-apiserver.example.yaml
+  rm /tmp/${app_name}*.tar.gz
+  rm config/${app_name}-apiserver.example.yaml
   rm config/promtail.example.yaml
 }