Merge pull request #12 from careagain-org/dev

Dev

Author: careagain-org

.github/workflows/build.yaml

@@ -48,10 +48,15 @@ jobs:
           SUPABASE_S3_BUCKET=${{ secrets.SUPABASE_S3_BUCKET}}
           SUPABASE_S3_SECRET_ACCESS_KEY=${{ secrets.SUPABASE_S3_SECRET_ACCESS_KEY}}
           SUPABASE_URL=${{ secrets.SUPABASE_URL}}
-          API_URL=${{ secrets.API_URL}}
-          WEB_URL=${{ secrets.WEB_URL }}
-          FRONTEND_PORT=${{ secrets.FRONTEND_PORT }}
-          BACKEND_PORT=${{ secrets.BACKEND_PORT }}
+          REFLEX_API_URL=${{ secrets.REFLEX_API_URL}}
+          REFLEX_WEB_URL=${{ secrets.REFLEX_WEB_URL }}
+          REFLEX_FRONTEND_PORT=${{ secrets.REFLEX_FRONTEND_PORT }}
+          REFLEX_BACKEND_PORT=${{ secrets.REFLEX_BACKEND_PORT }}
+          CLERK_PUBLIC_KEY=${{ secrets.CLERK_PUBLIC_KEY }}
+          CLERK_SECRET_KEY=${{ secrets.CLERK_SECRET_KEY }}
+          JWT_KEY=${{ secrets.JWT_KEY }}
+          CLERK_WEBHOOK_SECRET=${{ secrets.CLERK_WEBHOOK_SECRET }}
+          SUPABASE_API_SECRET_KEY=${{ secrets.SUPABASE_API_SECRET_KEY }}
           EOF
 
       - name: Build and push Docker image for linux/arm64

.github/workflows/deploy.yaml

@@ -44,10 +44,16 @@ jobs:
           SUPABASE_URL=${{ secrets.SUPABASE_URL }}
           DOCKERHUB_TOKEN=${{ secrets.DOCKERHUB_TOKEN }}
           DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}
-          API_URL=${{ secrets.API_URL}}
-          WEB_URL=${{ secrets.WEB_URL }}
-          FRONTEND_PORT=${{ secrets.FRONTEND_PORT }}
-          BACKEND_PORT=${{ secrets.BACKEND_PORT }}
+          REFLEX_API_URL=${{ secrets.REFLEX_API_URL}}
+          REFLEX_WEB_URL=${{ secrets.REFLEX_WEB_URL }}
+          REFLEX_FRONTEND_PORT=${{ secrets.REFLEX_FRONTEND_PORT }}
+          REFLEX_BACKEND_PORT=${{ secrets.REFLEX_BACKEND_PORT }}
+          CLERK_PUBLIC_KEY=${{ secrets.CLERK_PUBLIC_KEY }}
+          CLERK_SECRET_KEY=${{ secrets.CLERK_SECRET_KEY }}
+          JWT_KEY=${{ secrets.JWT_KEY }}
+          CLERK_WEBHOOK_SECRET=${{ secrets.CLERK_WEBHOOK_SECRET }}
+          SUPABASE_API_SECRET_KEY=${{ secrets.SUPABASE_API_SECRET_KEY }}
+
           EOF
 
       - name: Create Ansible Vars file

Dockerfile

@@ -10,13 +10,14 @@ RUN apt-get update && apt-get install -y \
     libpq-dev \
     gnupg \
     unzip \
+    xclip \
+    libxkbcommon-x11-0 \
     && curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION} | bash - \
     && apt-get install -y nodejs \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
-    apt-get install -y xclip && \
     rm -rf /var/lib/apt/lists/*
 
 # Install CA certs and dependencies
@@ -65,4 +66,4 @@ ENV REFLEX_DB_URL="sqlite:///reflex.db"
 STOPSIGNAL SIGKILL
 
 # Always apply migrations before starting the backend.
-CMD ["sh", "-c", "reflex db migrate && reflex run --env prod --backend-only"]
+CMD ["sh", "-c", "reflex db makemigrations && reflex db migrate && reflex run --env prod --backend-only --loglevel debug"]

README.md

@@ -61,8 +61,7 @@ version_path_separator = os  # Use os.pathsep. Default configuration used for ne
 # are written from script.py.mako
 # output_encoding = utf-8
 
-sqlalchemy.url = driver://user:pass@localhost/dbname
-
+sqlalchemy.url = ${{ secrets.SUPABASE_DB_URI }}
 
 [post_write_hooks]
 # post_write_hooks defines scripts or Python functions that are run

alembic.ini

@@ -24,7 +24,7 @@
 # for 'autogenerate' support
 # from myapp import mymodel
 # target_metadata = mymodel.Base.metadata
-target_metadata = Base.metadata
+target_metadata = [Base.metadata]
 
 # other values from the config, defined by the needs of env.py,
 # can be acquired:
@@ -57,7 +57,8 @@ def run_migrations_offline() -> None:
 
 def include_object(object, name, type_, reflected, compare_to):
     if type_ == "table":
-        return object.schema == "careagain_schema"
+        return object.schema == f"{os.environ.get('SUPABASE_DB_SCHEMA')}"
+
     return True
 
 
@@ -80,6 +81,7 @@ def run_migrations_online() -> None:
             connection=connection, 
             target_metadata=target_metadata,
             compare_type=True,
+            compare_server_default=True,
             include_schemas=True,
             version_table_schema=f"{os.environ.get('SUPABASE_DB_SCHEMA')}",
             include_object=include_object,

alembic/env.py

@@ -4,25 +4,32 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
+    volumes:
+      - /tmp/.X11-unix:/tmp/.X11-unix
+    tty: true
     image: careagain/careagain-webapp:latest
     env_file:
       - .env
     ports:
       - 3000:3000
     dns:
       - 1.1.1.1
-    command: reflex run --env prod --frontend-only
+    command: reflex run --frontend-only --loglevel debug
     depends_on:
       - app
   app:
     platform: linux/arm64
     build:
       context: .
       dockerfile: Dockerfile
+    volumes:
+      - /tmp/.X11-unix:/tmp/.X11-unix
+    tty: true
     image: careagain/careagain-webapp:latest
     env_file:
       - .env
     ports:
       - 8000:8000
     dns:
       - 1.1.1.1
+    command: reflex run --backend-only --loglevel debug