Revert "Added db migration to move heartbeat templates into dedicated service…" (#2507)

This reverts commit 2d70cc8.

Author: jimleroyer

docker-compose.yml

@@ -0,0 +1,111 @@
+version: '3'
+
+services:
+  db:
+    image: postgres:11.16@sha256:5d2aa4a7b5f9bdadeddcf87cf7f90a176737a02a30d917de4ab2e6a329bd2d45
+    volumes:
+      - ./local/initdb:/docker-entrypoint-initdb.d
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: chummy
+    ports:
+      - "5432:5432"
+    expose:
+      - "5432"
+    command:
+      - "postgres"
+      - "-c"
+      - "listen_addresses=*"
+    restart: always
+  redis:
+    image: redis:6.2@sha256:7919fdd5300e7abf7ae95919e6f144b37c55df16553302dbbcc7495a5aa0c079
+  web:
+    image: notification-api
+    restart: always
+    build:
+      context: .
+      dockerfile: local/Dockerfile
+    environment:
+      - REDIS_URL=redis://redis:6379/0
+      - SQLALCHEMY_DATABASE_URI=postgres://postgres:chummy@db:5432/notification_api
+    entrypoint: local/scripts/notify-web-entrypoint.sh
+    command: >
+      bash -c "make generate-version-file && make run"
+    volumes:
+      - .:/app
+    ports:
+      - "6011:6011"
+    depends_on:
+      - db
+      - redis
+  beat:
+    image: notification-api
+    restart: on-failure
+    build:
+      context: .
+      dockerfile: local/Dockerfile
+    environment:
+      - REDIS_URL=redis://redis:6379/0
+      - SQLALCHEMY_DATABASE_URI=postgres://postgres:chummy@db:5432/notification_api
+    entrypoint: local/scripts/notify-worker-entrypoint.sh
+    command: >
+      bash -c "sh scripts/run_celery_beat.sh"
+    volumes:
+      - .:/app
+    depends_on:
+      - db
+      - redis
+      - web
+  worker:
+    image: notification-api
+    restart: on-failure
+    build:
+      context: .
+      dockerfile: local/Dockerfile
+    environment:
+      - REDIS_URL=redis://redis:6379/0
+      - SQLALCHEMY_DATABASE_URI=postgres://postgres:chummy@db:5432/notification_api
+    entrypoint: local/scripts/notify-worker-entrypoint.sh
+    command: >
+      bash -c "[[ -f /tmp/celery.pid ]] && rm /tmp/celery.pid; sh /app/scripts/run_celery.sh"
+    volumes:
+      - .:/app
+    depends_on:
+      - db
+      - redis
+      - web
+  worker_sms:
+    image: notification-api
+    restart: on-failure
+    build:
+      context: .
+      dockerfile: local/Dockerfile
+    environment:
+      - REDIS_URL=redis://redis:6379/0
+      - SQLALCHEMY_DATABASE_URI=postgres://postgres:chummy@db:5432/notification_api
+    entrypoint: local/scripts/notify-worker-entrypoint.sh
+    command: >
+      bash -c "sh /app/scripts/run_celery_sms.sh"
+    volumes:
+      - .:/app
+    depends_on:
+      - db
+      - redis
+      - web
+  tests:
+    image: notification-api-tests
+    restart: "no"
+    build:
+      context: .
+      dockerfile: ci/Dockerfile.test
+    environment:
+      - REDIS_URL=redis://redis:6379/1
+      - SQLALCHEMY_DATABASE_URI=postgres://postgres:chummy@db:5432/test_notification_api
+      - SQLALCHEMY_DATABASE_READER_URI=postgres://reader:chummy@db:5432/test_notification_api
+    entrypoint: local/scripts/notify-worker-entrypoint.sh
+    command: >
+      bash -c "/app/scripts/run_tests.sh"
+    volumes:
+      - .:/app
+    depends_on:
+      - db

local/Dockerfile

@@ -0,0 +1,24 @@
+FROM python:3.12-alpine3.20@sha256:5049c050bdc68575a10bcb1885baa0689b6c15152d8a56a7e399fb49f783bf98
+
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV POETRY_VERSION "1.7.1"
+
+RUN apk add --no-cache bash build-base git gcc musl-dev postgresql-dev g++ make libffi-dev libmagic libcurl curl-dev && rm -rf /var/cache/apk/*
+
+# update pip
+RUN python -m pip install wheel poetry==${POETRY_VERSION}
+
+RUN set -ex && mkdir /app
+
+WORKDIR /app
+
+COPY . /app
+
+RUN poetry install
+
+ENV PORT=6011
+
+ARG GIT_SHA
+ENV GIT_SHA ${GIT_SHA}
+
+CMD ["sh", "-c", "poetry run gunicorn -c gunicorn_config.py application"]

local/initdb/notify-db-entrypoint.sh

@@ -0,0 +1,15 @@
+set -ex
+
+###################################################################
+# This script will get executed *once* the Docker container has 
+# been built. Commands that need to be executed with all available
+# tools and the filesystem mount enabled should be located here. 
+#
+# The PostgreSQL Docker image has an extension mechanism that does 
+# not necessitate to override the entrypoint or main command. One
+# simply has to copy a shell script into the 
+# /docker-entrypoint-initdb.d/ initialization folder. 
+###################################################################
+
+# Notify database setup.
+createdb --user=postgres notification_api

local/scripts/notify-web-entrypoint.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -x
+
+###################################################################
+# This script will get executed *once* the Docker container has 
+# been built. Commands that need to be executed with all available
+# tools and the filesystem mount enabled should be located here. 
+###################################################################
+
+cd /app 
+
+make generate-version-file
+
+# Upgrade schema of the notification_api database.
+flask db upgrade
+
+# Bubble up the main Docker command to container.
+exec "$@"

local/scripts/notify-worker-entrypoint.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -x
+
+###################################################################
+# This script will get executed *once* the Docker container has 
+# been built. Commands that need to be executed with all available
+# tools and the filesystem mount enabled should be located here. 
+###################################################################
+
+cd /app 
+
+# Bubble up the main Docker command to container.
+exec "$@"

migrations/versions/0475_change_notification_status.py

@@ -19,4 +19,4 @@ def upgrade():
 
 
 def downgrade():
-    op.execute("UPDATE notification_status_types set name = 'pinpoint-failure' where name = 'provider-failure'")
+    pass