Merge pull request #176 from cuappdev/migrate-dev-server

Moved migration execution to dev server

.github/workflows/deploy-dev.yml

@@ -27,13 +27,6 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: cornellappdev/uplift-dev:${{ steps.vars.outputs.sha_short }}
-          build-args: |
-            DB_PASSWORD=${{ secrets.DB_PASSWORD }}
-            DB_HOST=postgres
-            DB_NAME=${{ secrets.DB_NAME }}
-            DB_USERNAME=${{ secrets.DB_USERNAME }}
-            DB_PORT=${{ secrets.DB_PORT }}
-            FLASK_ENV=development
       - name: Remote SSH and Deploy
         uses: appleboy/ssh-action@master
         env:
@@ -52,4 +45,6 @@ jobs:
             sudo systemctl stop nginx
             sudo systemctl restart nginx
             docker stack deploy -c docker-compose.yml the-stack --with-registry-auth
+            sleep 30s
+            docker exec $(docker ps -q -f name=the-stack_web) flask db upgrade
             yes | docker system prune -a

Dockerfile

@@ -6,22 +6,4 @@ COPY . .
 ENV MAX_CONCURRENT_PIP=4
 RUN pip3 install --upgrade pip
 RUN pip3 install --exists-action w -r requirements.txt
-
-# to receive build arguments
-ARG DB_PASSWORD
-ARG DB_HOST
-ARG DB_NAME
-ARG DB_USERNAME
-ARG DB_PORT
-ARG FLASK_ENV
-
-# set env variables for build
-ENV DB_PASSWORD=${DB_PASSWORD}
-ENV DB_HOST=${DB_HOST}
-ENV DB_NAME=${DB_NAME}
-ENV DB_USERNAME=${DB_USERNAME}
-ENV DB_PORT=${DB_PORT}
-ENV FLASK_ENV=${FLASK_ENV}
-
-RUN flask db upgrade
 CMD python3 app.py

migrations/versions/24684343da0f_update_equipment_table_with_muscle_.py

@@ -0,0 +1,32 @@
+"""update equipment table with muscle groups
+
+Revision ID: 24684343da0f
+Revises: 
+Create Date: 2024-11-20 17:40:32.344965
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '24684343da0f'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('gear', 'cost',
+               existing_type=postgresql.DOUBLE_PRECISION(precision=53),
+               nullable=0)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('gear', 'cost',
+               existing_type=postgresql.DOUBLE_PRECISION(precision=53),
+               nullable=False)
+    # ### end Alembic commands ###