From ef67af65954ce0cd0a625db0dc5326f144a33d54 Mon Sep 17 00:00:00 2001 From: KenwoodFox <kenwood364@gmail.com> Date: Fri, 19 Jul 2024 14:24:10 -0400 Subject: [PATCH] Fix database inital migration --- docker-compose-prod.yml | 53 +++++++++++++++++++ ...k.py => 65d52e31576c_initial_migration.py} | 12 ++--- .../versions/69dde7217528_inital_migration.py | 35 ------------ 3 files changed, 59 insertions(+), 41 deletions(-) create mode 100644 docker-compose-prod.yml rename migrations/versions/{252b14a16837_revert_db_to_stock.py => 65d52e31576c_initial_migration.py} (89%) delete mode 100644 migrations/versions/69dde7217528_inital_migration.py diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml new file mode 100644 index 0000000..53c504f --- /dev/null +++ b/docker-compose-prod.yml @@ -0,0 +1,53 @@ +services: + db: + image: postgres:10.5 + restart: "always" + environment: + - POSTGRES_USER=postgres + - POSTGRES_PASSWORD=postgres + - POSTGRES_DB=project_hud_db + healthcheck: + test: + ["CMD", "pg_isready", "-q", "-d", "project_hud_db", "-U", "postgres"] + interval: 10s + timeout: 5s + retries: 5 + logging: + options: + max-size: 10m + max-file: "3" + ports: + - "5438:5432" + volumes: + - /opt/project_hud/postgres:/var/lib/postgresql/data + + # pgadmin: + # image: dpage/pgadmin4 + # container_name: pgadmin4_container + # restart: no + # ports: + # - "8888:80" + # environment: + # PGADMIN_DEFAULT_EMAIL: kenwood364@gmail.com + # PGADMIN_DEFAULT_PASSWORD: iamnotacrook + # volumes: + # - /opt/project_hud/pgadmin:/var/lib/pgadmin + + watchtower: + image: containrrr/watchtower + restart: "always" + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /root/.docker/config.json:/config.json + command: --interval 30 + + project_hud: + image: ghcr.io/frc-1721/project_hud-bot:feat-builds + depends_on: + db: + condition: service_healthy + ports: + - "5000:5000" + environment: + TZ: America/New_York + restart: "always" diff --git a/migrations/versions/252b14a16837_revert_db_to_stock.py b/migrations/versions/65d52e31576c_initial_migration.py similarity index 89% rename from migrations/versions/252b14a16837_revert_db_to_stock.py rename to migrations/versions/65d52e31576c_initial_migration.py index b8bc9b0..c902739 100644 --- a/migrations/versions/252b14a16837_revert_db_to_stock.py +++ b/migrations/versions/65d52e31576c_initial_migration.py @@ -1,8 +1,8 @@ -"""Revert db to stock +"""Initial migration -Revision ID: 252b14a16837 -Revises: 69dde7217528 -Create Date: 2024-07-19 13:01:03.413846 +Revision ID: 65d52e31576c +Revises: +Create Date: 2024-07-19 14:23:41.925886 """ from alembic import op @@ -10,8 +10,8 @@ # revision identifiers, used by Alembic. -revision = '252b14a16837' -down_revision = '69dde7217528' +revision = '65d52e31576c' +down_revision = None branch_labels = None depends_on = None diff --git a/migrations/versions/69dde7217528_inital_migration.py b/migrations/versions/69dde7217528_inital_migration.py deleted file mode 100644 index 51a69a3..0000000 --- a/migrations/versions/69dde7217528_inital_migration.py +++ /dev/null @@ -1,35 +0,0 @@ -"""Inital Migration - -Revision ID: 69dde7217528 -Revises: -Create Date: 2024-07-19 12:57:06.672609 - -""" -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision = '69dde7217528' -down_revision = None -branch_labels = None -depends_on = None - - -def upgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.drop_table('user') - # ### end Alembic commands ### - - -def downgrade(): - # ### commands auto generated by Alembic - please adjust! ### - op.create_table('user', - sa.Column('id', sa.INTEGER(), autoincrement=True, nullable=False), - sa.Column('username', sa.VARCHAR(length=80), autoincrement=False, nullable=False), - sa.Column('email', sa.VARCHAR(length=120), autoincrement=False, nullable=False), - sa.PrimaryKeyConstraint('id', name='user_pkey'), - sa.UniqueConstraint('email', name='user_email_key'), - sa.UniqueConstraint('username', name='user_username_key') - ) - # ### end Alembic commands ###