Merge branch 'main' into prenner/add-similarity-score

.github/workflows/hma-release.yaml

@@ -55,6 +55,7 @@ jobs:
           push: true
           provenance: false
           context: hasher-matcher-actioner
+          platforms: linux/amd64,linux/arm64
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LC }}/hma:latest
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LC }}/hma:${{ env.VERSION }}

hasher-matcher-actioner/.devcontainer/devcontainer.json

@@ -43,10 +43,10 @@
     }
   },
   "remoteUser": "vscode",
-  "postCreateCommand": "pip install --editable .[all]",
   "mounts": [
     "source=python-threatexchange-cmdhistory,target=/commandhistory,type=volume",
     "source=${localEnv:HOME}${localEnv:USERPROFILE},target=/host-home-folder,type=bind,consistency=cached"
   ],
+  "postCreateCommand": "/workspace/.devcontainer/postcreate.sh",
   "postAttachCommand": "/workspace/.devcontainer/startup.sh"
 }

hasher-matcher-actioner/.devcontainer/postcreate.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+
+pip install --editable .[all]
+
+# Find Python packages in opt and install them
+for setup_script in "$(find /workspace/extensions -name setup.py)"
+do
+    module_dir="$(dirname "$setup_script")"
+    pip install --editable "$module_dir"
+    for extension in "$(echo "import setuptools; [ print (p) for p in setuptools.find_packages('${module_dir}') ]" | python)"
+    do
+        threatexchange config extensions add "$extension"
+    done
+done

hasher-matcher-actioner/CONTRIBUTING.md

@@ -13,6 +13,33 @@ Open Media Match is written in Python, uses [Flask](https://flask.palletsproject
 
 Please see CONTRIBUTING in the repo root for more general guidelines on how to contribute by developing locally and submitting pull requests on GitHub.
 
+# Releasing a New Version
+
+To release a new version of the Open Media Match image, follow these steps:
+
+1. **Update the version.txt file**
+
+The version number is stored in the `version.txt` file located at the project subfolder. Modify this file to reflect the new version number (e.g., `v1.1.0`).
+
+```bash
+echo "v1.1.0" > version.txt
+```
+
+2. **Merge to main**
+Once the `version.txt` file is updated, and merged to main a new build will be triggered automatically via the CI/CD pipeline. This will create a new Docker image with the updated version and be pushed to the registry.
+
+3. **Verify the Build and Release**
+Monitor the build process to ensure everything runs smoothly. Once the build completes, the new Docker image will be tagged with the updated version and pushed to the registry.
+
+4. **Test the New Image**
+After the new image is successfully built and tagged, it can be tested locally by using the tagged image or deployed to your environment. This process may vary depending on your deployment setup (e.g., Kubernetes, Docker Swarm, etc.).
+
+**Notes:**
+- Do the version increase on its own PR to separate version releases from code changes.
+- Ensure any expected changes in the codebase are included in the release, and all tests are passing before modifying the `version.txt` file.
+- For breaking changes, consider incrementing the major version number (e.g., `v2.0.0`).
+
+
 # Developer onboarding and environment setup
 
 There are a few different ways you can set up a development instance of Open Media Match and get to work.

hasher-matcher-actioner/extensions/.gitignore

@@ -0,0 +1 @@
+*

hasher-matcher-actioner/extensions/README.md

@@ -0,0 +1,3 @@
+# Optional Packages
+
+Drop any Python packages here which you need to be installed to the container but which can not be added to the `pyproject.toml`, e.g. proprietary extensions.

hasher-matcher-actioner/version.txt

@@ -1 +1 @@
-1.0.5
+1.0.6