Migrate from make to just

.github/workflows/build-and-push.yml

@@ -34,22 +34,23 @@ jobs:
           "$GITHUB_REF_NAME" \
           "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY" \
           "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" > version.json
+      - name: Install just
+        run: sudo apt-get update && sudo apt-get install just
       - name: Output version.json
         run: cat version.json
       - name: Build Docker images
         run: |
-          make build
+          just build
           docker compose images
       - name: Verify requirements.txt contains correct dependencies
         run: |
-          docker run --rm local/socorro_app shell ./bin/verify_reqs.sh
+          just shell ./bin/verify_reqs.sh
       - name: Run lint check
         run: |
-          docker run --rm local/socorro_app shell ./bin/lint.sh
+          just lint
       - name: Run tests
         run: |
-          make my.env
-          docker compose run --rm test-ci shell ./bin/test.sh
+          just test-ci
 
       - name: Set Docker image tag to "latest" for updates of the main branch
         if: github.ref == 'refs/heads/main'

.gitignore

@@ -25,7 +25,7 @@ symbols/
 .devcontainer-build
 .cache/
 docker-compose.override.yml
-my.env
+.env
 
 # docs things
 docs/_build/

bin/lint.sh

@@ -16,11 +16,18 @@ FILES="socorro-cmd docker socorro webapp bin"
 PYTHON_VERSION=$(python --version)
 
 
-if [[ "${1:-}" == "--fix" ]]; then
+if [[ "${1:-}" == "--help" ]]; then
+    echo "Usage: $0 [OPTIONS]"
+    echo
+    echo "  Lint code"
+    echo
+    echo "Options:"
+    echo "  --help  Show this message and exit."
+    echo "  --fix   Reformat code."
+elif [[ "${1:-}" == "--fix" ]]; then
     echo ">>> ruff fix (${PYTHON_VERSION})"
     ruff format $FILES
     ruff check --fix $FILES
-
 else
     echo ">>> ruff (${PYTHON_VERSION})"
     ruff check $FILES

docker-compose.yml

@@ -1,14 +1,24 @@
 ---
+# Sets the base name for containers and networks for docker-compose to
+# "socorro_". This is normally set by the name of this directory, but
+# if you clone the repository with a different directory name, then
+# you end up with a different project name and then everything is hosed.
+# Setting it here fixes that.
+name: socorro
+
 services:
   # Socorro app image
   app:
     build:
       context: .
       dockerfile: docker/Dockerfile
+      args:
+        userid: ${USE_UID:-10001}
+        groupid: ${USE_GID:-10001}
     image: local/socorro_app
     env_file:
       - docker/config/local_dev.env
-      - my.env
+      - .env
     depends_on:
       - fakesentry
       - statsd
@@ -65,7 +75,7 @@ services:
     env_file:
       - docker/config/local_dev.env
       - docker/config/test.env
-      - my.env
+      - .env
     depends_on:
       - fakesentry
       - statsd
@@ -81,7 +91,7 @@ services:
     image: local/socorro_app
     env_file:
       - docker/config/local_dev.env
-      - my.env
+      - .env
     depends_on:
       - fakesentry
       - statsd
@@ -98,7 +108,7 @@ services:
     image: local/socorro_app
     env_file:
       - docker/config/local_dev.env
-      - my.env
+      - .env
     depends_on:
       - fakesentry
       - statsd
@@ -113,7 +123,7 @@ services:
     image: local/socorro_app
     env_file:
       - docker/config/local_dev.env
-      - my.env
+      - .env
     depends_on:
       - fakesentry
       - statsd
@@ -134,7 +144,7 @@ services:
     image: local/socorro_app
     env_file:
       - docker/config/local_dev.env
-      - my.env
+      - .env
     depends_on:
       - fakesentry
       - gcs-emulator
@@ -178,7 +188,7 @@ services:
     image: mozilla/socorro_collector:latest
     env_file:
       - docker/config/local_dev.env
-      - my.env
+      - .env
     depends_on:
       - gcs-emulator
       - pubsub
@@ -194,7 +204,7 @@ services:
     image: local/socorro_app
     env_file:
       - docker/config/local_dev.env
-      - my.env
+      - .env
     command: ["fakecollector"]
     ports:
       - "9000:8000"
@@ -205,7 +215,7 @@ services:
     image: local/socorro_app
     env_file:
       - docker/config/local_dev.env
-      - my.env
+      - .env
     command: ["symbolsserver"]
     stop_signal: SIGINT
     ports:

docker/config/my.env.dist → docker/config/.env.dist

@@ -2,14 +2,16 @@
 # environment. Since these are specific to your local development environment,
 # don't check them in.
 
+PYTHONUNBUFFERED=true
+
 # ---------------------------------------------
 # Docker settings
 # ---------------------------------------------
 
 # If you want to set the uid and gid of the app user that we use in the
 # containers, you can do that with these two variables.
-# SOCORRO_UID=
-# SOCORRO_GID=
+# USE_UID=
+# USE_GID=
 
 # ---------------------------------------------
 # processor settings