prune: remove a lot of junk

eesoymilk · May 19, 2024 · 6c56cdf · 6c56cdf
1 parent 5c65838
commit 6c56cdf
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 661 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,24 +5,15 @@ on:
     paths:
       - ".github/workflows/**.yml"
       - "Dockerfile"
-      - "docker-compose.yml"
       - "**.py"
       - "requirements.txt"
 
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
-  # CONTAINER_NAME: soybot-container
-
   KAMATERA_USER: soymilk
   KAMATERA_PORT: 22
   KAMATERA_PATH: ~/app/soybot
-
-  POSTGRES_PORT: 5432
-  POSTGRES_USER: postgres
-  POSTGRES_DB: soybot
-  POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
-
   GCPLOGS_AUTH_PATH: /root/.config/gcplogs/auth.json
   GCP_PROJECT: eesoybot
 
@@ -59,15 +50,15 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-      - name: Copy docker-compose.yml to Kamatera
-        run: |
-          echo "${{ secrets.KAMATERA_KEY }}" > private_key.pem
-          chmod 600 private_key.pem
-          scp -o StrictHostKeyChecking=no \
-          -i private_key.pem \
-          -P ${{ env.KAMATERA_PORT }} \
-          ./docker-compose.yml \
-          ${{ env.KAMATERA_USER }}@${{ secrets.KAMATERA_HOST }}:${{ env.KAMATERA_PATH }}
+      # - name: Copy docker-compose.yml to Kamatera
+      #   run: |
+      #     echo "${{ secrets.KAMATERA_KEY }}" > private_key.pem
+      #     chmod 600 private_key.pem
+      #     scp -o StrictHostKeyChecking=no \
+      #     -i private_key.pem \
+      #     -P ${{ env.KAMATERA_PORT }} \
+      #     ./docker-compose.yml \
+      #     ${{ env.KAMATERA_USER }}@${{ secrets.KAMATERA_HOST }}:${{ env.KAMATERA_PATH }}
 
   deploy:
     needs: build-and-push
@@ -80,17 +71,12 @@ jobs:
           username: soymilk
           key: ${{ secrets.KAMATERA_KEY }}
           script: |
-            cd ${{ env.KAMATERA_PATH }}
-
-            export TOKEN=${{ secrets.TOKEN }}
-            export OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }}
-            export GCP_PROJECT=${{ env.GCP_PROJECT }}
-            export POSTGRES_PORT=${{ env.POSTGRES_PORT }}
-            export POSTGRES_USER=${{ env.POSTGRES_USER }}
-            export POSTGRES_DB=${{ env.POSTGRES_DB }}
-            export POSTGRES_PASSWORD=${{ env.POSTGRES_PASSWORD }}
-
-            docker compose down
-            docker system prune -f
-            docker compose pull
-            docker compose up -d
+            docker stop soybot || true
+            docker run -d \
+              --name soybot \
+              -e TOKEN=${ secrets.TOKEN } \
+              -e OPENAI_API_KEY=${ secrets.OPENAI_API_KEY } \
+              -e GCP_PROJECT=${ secrets.GCP_PROJECT } \
+              --log-driver=gcplogs \
+              --log-opt gcp-project=${ env.GCP_PROJECT } \
+              ghcr.io/soymilk/soybot:latest
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+.DS_Store
+
 *.ipynb
 
 # logs

diff --git a/alembic.ini b/alembic.ini
diff --git a/alembic/README b/alembic/README
diff --git a/alembic/env.py b/alembic/env.py
diff --git a/alembic/script.py.mako b/alembic/script.py.mako
diff --git a/commands/__init__.py b/commands/__init__.py
diff --git a/commands/starburst.py b/commands/starburst.py
diff --git a/docker-compose.yml b/docker-compose.yml
-Original file line number
+Diff line change
@@ -1,3 +1,5 @@
+    .DS_Store
     *.ipynb
     # logs
@@ Expand Down @@