Merge pull request #3 from EveryFine/dev

Add action for main branch
EveryFine · May 18, 2024 · 6e4ca24 · 6e4ca24
2 parents 8327485 + 619da0c
commit 6e4ca24
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 10 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -1,9 +1,10 @@
 name: Genius AI Dev Deploy
 on:
-  push:
-    branches: [ "dev" ]
-  pull_request:
-    branches: [ "dev" ]
+  # push:
+  #   branches: [ "dev" ]
+  # pull_request:
+  #   branches: [ "dev" ]
+  workflow_dispatch
 
 env:
   REGISTRY: ghcr.io
@@ -14,7 +15,7 @@ env:
   TARGET_SSH_PORT: ${{ secrets.TARGET_SSH_PORT }}
   TARGET_SERVICE_PORT: 13501
   OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-  TAVILY_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+  TAVILY_API_KEY: ${{ secrets.TAVILY_API_KEY }}
   STREAMLIT_CONFIG: ${{ secrets.STREAMLIT_CONFIG }}
 
 jobs:
@@ -46,10 +47,7 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
+           type=sha,prefix={{branch}}-
       
       - name: Build and push Docker image
         id: push

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,75 @@
+name: Genius AI Main Deploy
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+  workflow_dispatch
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}/geniuschatbots
+  TARGET_SSH_HOST: ${{ secrets.TARGET_SSH_HOST }}
+  TARGET_SSH_USER: ${{ secrets.TARGET_SSH_USER }}
+  TARGET_SSH_PASSWORD: ${{ secrets.TARGET_SSH_PASSWORD }}
+  TARGET_SSH_PORT: ${{ secrets.TARGET_SSH_PORT }}
+  TARGET_SERVICE_PORT: 13501
+  OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+  TAVILY_API_KEY: ${{ secrets.TAVILY_API_KEY }}
+  STREAMLIT_CONFIG: ${{ secrets.STREAMLIT_CONFIG }}
+
+jobs:
+  build-and-push-image:
+    name: Build Docker image and push to repositories
+    runs-on: ubuntu-latest
+    environment: main
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Write streamlit config
+        run: |
+          mkdir GeniusChatbots/.streamlit
+          echo "${{ env.STREAMLIT_CONFIG }}" > GeniusChatbots/.streamlit/config.yaml
+      - name: Log in to the Container registry
+        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=sha,prefix={{branch}}-
+      
+      - name: Build and push Docker image
+        id: push
+        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        with:
+          context: GeniusChatbots
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: deploying
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ env.TARGET_SSH_HOST }}
+          username: ${{ env.TARGET_SSH_USER }}
+          password: ${{ env.TARGET_SSH_PASSWORD }}
+          port: ${{ env.TARGET_SSH_PORT }}
+          script: |
+            docker image pull ${{ steps.meta.outputs.tags }}
+            docker container stop geniusmain
+            docker container rm geniusmain
+            docker container run -d --name geniusmain -p ${{ env.TARGET_SERVICE_PORT }}:8501 -e OPENAI_API_KEY=${{ env.OPENAI_API_KEY }} -e TAVILY_API_KEY=${{ env.TAVILY_API_KEY }} ${{ steps.meta.outputs.tags }}
+
+
+      
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ env:
   TARGET_SSH_PORT: ${{ secrets.TARGET_SSH_PORT }}
   TARGET_SERVICE_PORT: 23501
   OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-  TAVILY_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+  TAVILY_API_KEY: ${{ secrets.TAVILY_API_KEY }}
   STREAMLIT_CONFIG: ${{ secrets.STREAMLIT_CONFIG }}
 
 jobs: