redis n procfiles (#358)

* dd some smol redis instance types

* make Procfile specifiable also

* ignore comments and empty lines in procfiles

Author: ewdurbin

cabotage/celery/tasks/build.py

@@ -446,22 +446,23 @@ def file_path(filename):
             f"{git_ref(image.application.github_repository, image.commit_sha)}"
         )
 
-    procfile_body = _fetch_github_file(
-        image.application.github_repository,
-        image.commit_sha,
-        access_token=access_token,
-        filename=file_path("Procfile.cabotage"),
-    )
-    if procfile_body is None:
+    procfile_candidates = ["Procfile.cabotage", "Procfile"]
+    if image.application.procfile_path:
+        procfile_candidates = [image.application.procfile_path]
+
+    procfile_body = None
+    for candidate in procfile_candidates:
         procfile_body = _fetch_github_file(
             image.application.github_repository,
             image.commit_sha,
             access_token=access_token,
-            filename=file_path("Procfile"),
+            filename=file_path(candidate),
         )
+        if procfile_body is not None:
+            break
     if procfile_body is None:
         raise BuildError(
-            "No Procfile.cabotage or Procfile found in root of "
+            "No Procfile found in "
             f"{git_ref(image.application.github_repository, image.commit_sha)}"
         )
 

cabotage/client/templates/user/project_application_settings.html

@@ -67,6 +67,7 @@ <h2 class="text-sm font-semibold text-base-content">Source & Automation</h2>
             {{ render_field_compact(form.auto_deploy_branch, placeholder='main', label='Branch') }}
             {{ render_field_compact(form.subdirectory, placeholder='/', label='Subdirectory') }}
             {{ render_field_compact(form.dockerfile_path, placeholder='Dockerfile.cabotage', label='Dockerfile Path') }}
+            {{ render_field_compact(form.procfile_path, placeholder='Procfile.cabotage', label='Procfile Path') }}
           </div>
           <div class="mt-2">
             {{ render_field_compact(form.branch_deploy_watch_paths, placeholder='src/**', label='Watch Paths', extra_class='auto-grow') }}

cabotage/server/audit_helpers.py

@@ -38,6 +38,7 @@
     "process_pod_classes": "pod classes",
     "subdirectory": "subdirectory",
     "dockerfile_path": "Dockerfile path",
+    "procfile_path": "Procfile path",
     "branch_deploy_watch_paths": "watch paths",
 }
 

cabotage/server/models/projects.py

@@ -554,6 +554,7 @@ def active_application_environments(self):
     subdirectory: Mapped[str | None] = mapped_column(Text())
 
     dockerfile_path: Mapped[str | None] = mapped_column(Text())
+    procfile_path: Mapped[str | None] = mapped_column(Text())
     branch_deploy_watch_paths: Mapped[Any | None] = mapped_column(
         postgresql.JSONB(),
     )

cabotage/server/models/resources.py

@@ -66,6 +66,14 @@
 }
 
 redis_size_classes: dict[str, dict[str, dict[str, str]]] = {
+    "cache.nano": {
+        "cpu": {"requests": "33m", "limits": "66m"},
+        "memory": {"requests": "64Mi", "limits": "64Mi"},
+    },
+    "cache.micro": {
+        "cpu": {"requests": "66m", "limits": "132m"},
+        "memory": {"requests": "128Mi", "limits": "128Mi"},
+    },
     "cache.small": {
         "cpu": {"requests": "125m", "limits": "250m"},
         "memory": {"requests": "256Mi", "limits": "256Mi"},

cabotage/server/user/forms.py

@@ -362,6 +362,14 @@ class EditApplicationSettingsForm(FlaskForm):
             (lambda x: x if x else None),
         ],
     )
+    procfile_path = StringField(
+        "Procfile Path",
+        description="Custom path to Procfile (e.g. deploy/Procfile), falls back to Procfile.cabotage then Procfile",
+        filters=[
+            (lambda x: x.strip() if (x and isinstance(x, str)) else x),
+            (lambda x: x if x else None),
+        ],
+    )
     branch_deploy_watch_paths = TextAreaField(
         "Watch Paths",
         description="Only deploy this app when files matching these patterns change. One .gitignore-style pattern per line (e.g. src/**, Dockerfile). Leave empty to always deploy.",

cabotage/utils/procfile.py

@@ -93,7 +93,11 @@ def _parse_procfile_line(line):
 def loads(content):
     """Load a Procfile from a string."""
     lines = _group_lines(line for line in content.split("\n"))
-    lines = [(i, _parse_procfile_line(line)) for i, line in lines if line.strip()]
+    lines = [
+        (i, _parse_procfile_line(line))
+        for i, line in lines
+        if line.strip() and not line.lstrip().startswith("#")
+    ]
     errors = []
     # Reject files with duplicate process types (no sane default).
     duplicates = _find_duplicates(((i, line[0]) for i, line in lines))

migrations/versions/2b6f8e9621b8_add_configurable_procfile_path_to_.py

@@ -0,0 +1,41 @@
+"""add configurable procfile_path to applications
+
+Revision ID: 2b6f8e9621b8
+Revises: aa90a43a1737
+Create Date: 2026-04-23 17:48:57.059148
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "2b6f8e9621b8"
+down_revision = "aa90a43a1737"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("project_applications", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("procfile_path", sa.Text(), nullable=True))
+
+    with op.batch_alter_table("project_applications_version", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column("procfile_path", sa.Text(), autoincrement=False, nullable=True)
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("project_applications_version", schema=None) as batch_op:
+        batch_op.drop_column("procfile_path")
+
+    with op.batch_alter_table("project_applications", schema=None) as batch_op:
+        batch_op.drop_column("procfile_path")
+
+    # ### end Alembic commands ###

tests/test_audit_helpers.py

@@ -537,6 +537,21 @@ def test_app_edit_shows_changed_fields(self, db_session, application):
         fields = {c["field"] for c in result[entry.id]}
         assert "auto deploy branch" in fields
 
+    def test_app_edit_procfile_path_uses_human_label(self, db_session, application):
+        self._create_activity(db_session, "create", application)
+        db_session.commit()
+
+        application.procfile_path = "deploy/Procfile.web"
+        db_session.flush()
+        act = self._create_activity(db_session, "edit", application)
+        db_session.commit()
+        entry = self._audit_entry_for(db_session, act)
+
+        result = compute_audit_changes([entry])
+        assert entry.id in result
+        fields = {c["field"] for c in result[entry.id]}
+        assert "Procfile path" in fields
+
     def test_app_edit_no_op(self, db_session, application):
         self._create_activity(db_session, "create", application)
         db_session.commit()

tests/test_build.py

@@ -356,6 +356,61 @@ def test_missing_procfile_raises(
         with pytest.raises(BuildError, match="No Procfile"):
             build_image_buildkit(image)
 
+    @patch("cabotage.celery.tasks.build._fetch_github_file")
+    def test_fetch_image_source_uses_custom_procfile_path(
+        self,
+        mock_fetch_file,
+        app,
+        db_session,
+        image,
+    ):
+        """A configured procfile_path is fetched instead of the default candidates."""
+        from cabotage.celery.tasks.build import _fetch_image_source
+
+        image.application.subdirectory = "services/api"
+        image.application.procfile_path = "deploy/Procfile.web"
+        mock_fetch_file.side_effect = [
+            None,
+            DOCKERFILE_BODY,
+            PROCFILE_BODY,
+        ]
+
+        result = _fetch_image_source(image, access_token=None)
+
+        assert result["procfile_body"] == PROCFILE_BODY
+        assert [call.kwargs["filename"] for call in mock_fetch_file.call_args_list] == [
+            "services/api/Dockerfile.cabotage",
+            "services/api/Dockerfile",
+            "services/api/deploy/Procfile.web",
+        ]
+
+    @patch("cabotage.celery.tasks.build._fetch_github_file")
+    def test_fetch_image_source_custom_procfile_path_does_not_fallback(
+        self,
+        mock_fetch_file,
+        app,
+        db_session,
+        image,
+    ):
+        """A configured procfile_path mirrors dockerfile_path and disables fallback."""
+        from cabotage.celery.tasks.build import _fetch_image_source, BuildError
+
+        image.application.procfile_path = "deploy/Procfile.web"
+        mock_fetch_file.side_effect = [
+            None,
+            DOCKERFILE_BODY,
+            None,
+        ]
+
+        with pytest.raises(BuildError, match="No Procfile"):
+            _fetch_image_source(image, access_token=None)
+
+        assert [call.kwargs["filename"] for call in mock_fetch_file.call_args_list] == [
+            "Dockerfile.cabotage",
+            "Dockerfile",
+            "deploy/Procfile.web",
+        ]
+
     @patch("cabotage.celery.tasks.build.GithubIntegration")
     @patch("cabotage.celery.tasks.build.GithubAppAuth")
     @patch("cabotage.celery.tasks.build.github_app")