Improve how golang-migrate is installed and add migration command to …

…makefile.

.github/workflows/ci.yml

@@ -69,10 +69,10 @@ jobs:
       - name: Install dependencies
         run: |
           poetry install --with test
-      - name: Install go migrate
+      - name: Install golang-migrate
         run: |
-          curl -s https://packagecloud.io/install/repositories/golang-migrate/migrate/script.deb.sh | sudo bash
-          sudo apt-get update && sudo apt-get install -y migrate
+          wget -O golang-migrate.deb https://github.com/golang-migrate/migrate/releases/download/v4.17.0/migrate.linux-amd64.deb
+          sudo dpkg -i golang-migrate.deb && rm golang-migrate.deb
       - name: Run tests
         env:
           POSTGRES_HOST: localhost

Dockerfile

@@ -16,8 +16,9 @@ RUN yarn build
 FROM python:3.11
 
 # Install system dependencies
-RUN curl -s https://packagecloud.io/install/repositories/golang-migrate/migrate/script.deb.sh | bash
-RUN apt-get update && apt-get install -y migrate libmagic1 && rm -rf /var/lib/apt/lists/*
+RUN wget -O golang-migrate.deb https://github.com/golang-migrate/migrate/releases/download/v4.17.0/migrate.linux-amd64.deb \
+    && dpkg -i golang-migrate.deb \
+    && rm golang-migrate.deb
 
 # Install Poetry
 RUN pip install poetry

backend/Dockerfile

@@ -2,8 +2,9 @@
 FROM python:3.11
 
 # Install system dependencies
-RUN curl -s https://packagecloud.io/install/repositories/golang-migrate/migrate/script.deb.sh | bash
-RUN apt-get update && apt-get install -y migrate libmagic1 && rm -rf /var/lib/apt/lists/*
+RUN wget -O golang-migrate.deb https://github.com/golang-migrate/migrate/releases/download/v4.17.0/migrate.linux-amd64.deb \
+    && dpkg -i golang-migrate.deb \
+    && rm golang-migrate.deb
 
 # Install Poetry
 RUN pip install poetry

backend/Makefile

@@ -16,6 +16,9 @@ TEST_FILE ?= tests/unit_tests/
 start:
 	poetry run uvicorn app.server:app --reload --port 8100
 
+migrate:
+	migrate -database postgres://$(POSTGRES_USER):$(POSTGRES_PASSWORD)@$(POSTGRES_HOST):$(POSTGRES_PORT)/$(POSTGRES_DB)?sslmode=disable -path ./migrations up
+
 test:
 	# We need to update handling of env variables for tests
 	YDC_API_KEY=placeholder OPENAI_API_KEY=placeholder poetry run pytest $(TEST_FILE)

backend/tests/unit_tests/conftest.py

@@ -45,12 +45,7 @@ async def _drop_test_db() -> None:
 
 
 def _migrate_test_db() -> None:
-    dsn = (
-        f"postgres://{os.environ['POSTGRES_USER']}:{os.environ['POSTGRES_PASSWORD']}"
-        f"@{os.environ['POSTGRES_HOST']}:{os.environ['POSTGRES_PORT']}/{TEST_DB}?sslmode=disable"
-    )
-    cmd = ["migrate", "-path", "./migrations", "-database", dsn, "up"]
-    subprocess.run(cmd, check=True)
+    subprocess.run(["make", "migrate"], check=True)
 
 
 @pytest.fixture(scope="session")