Skip to content

Commit

Permalink
Merge branch 'main' into fix-alias-tab
Browse files Browse the repository at this point in the history
  • Loading branch information
glenn-sorrentino authored Jan 21, 2025
2 parents 6e86a06 + cbb73be commit 95069dd
Show file tree
Hide file tree
Showing 4 changed files with 292 additions and 204 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ENV PATH="/root/.cargo/bin:${PATH}"

# Install Poetry dependencies
COPY poetry.lock pyproject.toml /app/
RUN poetry install --no-root
RUN poetry install --no-root --without dev

# Copy the rest of the application
COPY . /app
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ run-full: ## Run the app with all features enabled

.PHONY: migrate-dev
migrate-dev: ## Run dev env migrations
poetry run ./scripts/dev_migrations.py
docker compose run app poetry run ./scripts/dev_migrations.py

.PHONY: migrate-prod
migrate-prod: ## Run prod env (alembic) migrations
poetry run flask db upgrade
docker compose run app poetry run flask db upgrade

.PHONY: dev-data
dev-data: migrate-dev ## Run dev env migrations, and add dev data
Expand All @@ -48,7 +48,7 @@ revision: migrate-prod ## Create a new migration
ifndef message
$(error 'message' must be set when invoking the revision target, eg `make revision message="short message"`)
endif
poetry run flask db revision -m "$(message)" --autogenerate
docker compose run app poetry run flask db revision -m "$(message)" --autogenerate

TESTS ?= ./tests/
.PHONY: test
Expand Down
Loading

0 comments on commit 95069dd

Please sign in to comment.