Merge pull request #7 from sredevopsorg/upstream

Author: ngeorger

.github/renovate.json5

@@ -29,7 +29,7 @@
     },
     {
       // Exclude dependencies in jobs that don't have automated tests
-      "matchPaths": ["jobs/populate-explore-json/**", "jobs/cleanup-expired-key-value-records/**", "jobs/update-external-accounts/**"],
+      "matchPaths": ["jobs/populate-explore-json/**"],
       "enabled": false
     }
   ]

.github/workflows/build.yml

@@ -220,53 +220,6 @@ jobs:
           path: /tmp/activitypub-migrations-${{ matrix.platform_slug }}.tar
           retention-days: 1
 
-  build-cleanup-job:
-    name: Build Cleanup Job Image
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Check for changes in cleanup job
-        id: changes
-        uses: dorny/paths-filter@v3
-        with:
-          filters: |
-            cleanup:
-              - 'jobs/cleanup-expired-key-value-records/**'
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Docker metadata
-        if: steps.changes.outputs.cleanup == 'true'
-        id: cleanup-meta
-        uses: docker/metadata-action@v5
-        with:
-          images: europe-docker.pkg.dev/ghost-activitypub/activitypub/cleanup-expired-key-value-records
-          tags: |
-            type=sha
-            type=edge,branch=main
-
-      - name: Authenticate with GCP
-        if: steps.changes.outputs.cleanup == 'true'
-        uses: google-github-actions/auth@v2
-        id: gcp-auth
-        with:
-          token_format: access_token
-          workload_identity_provider: projects/687476608778/locations/global/workloadIdentityPools/github-oidc-activitypub/providers/github-provider-activitypub
-          service_account: cicd-activitypub-terraform@ghost-activitypub.iam.gserviceaccount.com
-
-      - name: Build cleanup job image
-        if: steps.changes.outputs.cleanup == 'true'
-        uses: docker/build-push-action@v6
-        with:
-          context: jobs/cleanup-expired-key-value-records
-          load: true
-          tags: ${{ steps.cleanup-meta.outputs.tags }}
-          push: true
-
   build-populate-explore-json-job:
     name: Build Populate Explore JSON Job
     runs-on: ubuntu-latest

.github/workflows/cicd.yml

@@ -59,9 +59,10 @@ jobs:
     name: Slack Notification on Failure
     needs: [build, test, push, deploy]
     runs-on: ubuntu-latest
+    if: always()
     steps:
       - uses: tryghost/actions/actions/slack-build@main
-        if: always() && failure() && github.event_name == 'push' && github.ref == 'refs/heads/main'
+        if: failure() && github.event_name == 'push' && github.ref == 'refs/heads/main'
         with:
           status: ${{ job.status }}
         env:

dev/scripts/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bookworm@sha256:7dc1e2b39b0147079a16347915e9583cb2f239d4896fe2beac396b979e5c06a9
+FROM debian:bookworm@sha256:93492d1405a072c9d3b89110490e330e0b7eb37754cafc9520908b7fe6873f5f
 
 RUN apt-get update -y
 RUN apt-get install -y curl openssl jq

docker-compose.yml

@@ -28,7 +28,6 @@ services:
       - GCP_BUCKET_NAME=activitypub
       - GCP_STORAGE_EMULATOR_HOST=http://fake-gcs:4443
       # - GCS_LOCAL_STORAGE_HOSTING_URL=https://<tailscale-url>/.ghost/activitypub/gcs
-      - ACTIVITYPUB_COLLECTION_PAGE_SIZE=20
       - LOCAL_STORAGE_PATH=/opt/activitypub/content
       # - LOCAL_STORAGE_HOSTING_URL=https://<tailscale-url>/.ghost/activitypub/local-storage
       # - GHOST_PRO_IP_ADDRESSES=100.83.192.90,192.168.65.1
@@ -64,15 +63,6 @@ services:
       mysql:
         condition: service_healthy
 
-  cleanup-expired-key-value-records:
-    build: jobs/cleanup-expired-key-value-records
-    environment:
-      - MYSQL_USER=ghost
-      - MYSQL_PASSWORD=password
-      - MYSQL_HOST=mysql
-      - MYSQL_PORT=3306
-      - MYSQL_DATABASE=activitypub
-
   scripts:
     build: dev/scripts
     depends_on:
@@ -90,7 +80,7 @@ services:
       - activitypub
 
   mysql:
-    image: mysql:8.4.6@sha256:6e60ad6d61d8e7f0a4fd07f6b14109331d66a2f0d089e4b7a1f485d671a29604
+    image: mysql:8.4.6@sha256:5367102acfefeaa47eb0eb57c8d4f8b96c8c14004859131eac9bbfaa62f81e34
     environment:
       - MYSQL_ROOT_PASSWORD=root
       - MYSQL_USER=ghost
@@ -168,7 +158,6 @@ services:
       - GCP_BUCKET_NAME=activitypub
       - GCS_LOCAL_STORAGE_HOSTING_URL=http://fake-gcs:4443/.ghost/activitypub/gcs
       - GCP_STORAGE_EMULATOR_HOST=http://fake-gcs:4443
-      - ACTIVITYPUB_COLLECTION_PAGE_SIZE=2
       - REDIS_HOST=redis-testing
       - REDIS_PORT=6379
       - FEDIFY_KV_STORE_TYPE=redis
@@ -202,15 +191,6 @@ services:
       mysql-testing:
         condition: service_healthy
 
-  cleanup-expired-key-value-records-testing:
-    build: jobs/cleanup-expired-key-value-records
-    environment:
-      - MYSQL_USER=ghost
-      - MYSQL_PASSWORD=password
-      - MYSQL_HOST=mysql-testing
-      - MYSQL_PORT=3306
-      - MYSQL_DATABASE=activitypub
-
   cucumber-tests:
     networks:
       - test_network
@@ -242,7 +222,7 @@ services:
   mysql-testing:
     networks:
       - test_network
-    image: mysql:8.4.6@sha256:6e60ad6d61d8e7f0a4fd07f6b14109331d66a2f0d089e4b7a1f485d671a29604
+    image: mysql:8.4.6@sha256:5367102acfefeaa47eb0eb57c8d4f8b96c8c14004859131eac9bbfaa62f81e34
     environment:
       - MYSQL_ROOT_PASSWORD=root
       - MYSQL_USER=ghost

docs/env-vars.md

@@ -20,8 +20,6 @@ This ActivityPub service uses a variety of environment variables to configure it
 - `SKIP_SIGNATURE_VERIFICATION` - Set to `true` to skip ActivityPub signature verification
   - This is only used in `development` and `testing` environments
   - See [https://github.com/fedify-dev/fedify/issues/110](https://github.com/fedify-dev/fedify/issues/110) for more details
-- `ACTIVITYPUB_COLLECTION_PAGE_SIZE`* - Set the number of items to return per page for an ActivityPub collection
-  - This used by the `outbox` and `following` collections
 - `FEDIFY_KV_STORE_TYPE` - Set to `redis` to use Redis as the [key-value store for Fedify](https://fedify.dev/manual/kv)
   - If not set, MySQL will be used
 - `USE_MQ` - Set to `true` to enable message queue usage

docs/one-off-jobs.md

@@ -6,9 +6,10 @@ Previous examples of this:
 
 - [PR #407](https://github.com/TryGhost/ActivityPub/pull/407)
 - [PR #1240](https://github.com/TryGhost/ActivityPub/pull/1240)
+- [PR #1295](https://github.com/TryGhost/ActivityPub/pull/1295)
 
-One-off jobs are usually added to the repo for a short period, then
-removed once confirmed no longer needed.
+One-off jobs are usually added to the repo for a short period of time, then
+removed once confirmed that they are no longer needed
 
 Even though the job is one-off, it is still important to ensure that the logic
 is covered by sufficient tests

jobs/__template__/Dockerfile

@@ -1,4 +1,4 @@
-FROM oven/bun:1.2.21-alpine@sha256:02564b43c26a0dc156ff4b70d7ccb68ebae5c486771d699ed1520c42e6ac5cb0
+FROM oven/bun:1.2.23-alpine@sha256:0841c588f6304300baf1d395ae339ce09a6e18c4b6a7cdd4fddcbdb87a2f096a
 
 WORKDIR /opt/job
 

jobs/__template__/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   mysql-test:
-    image: mysql:8.4.6@sha256:6e60ad6d61d8e7f0a4fd07f6b14109331d66a2f0d089e4b7a1f485d671a29604
+    image: mysql:8.4.6@sha256:5367102acfefeaa47eb0eb57c8d4f8b96c8c14004859131eac9bbfaa62f81e34
     environment:
       MYSQL_ROOT_PASSWORD: root
       MYSQL_DATABASE: __JOB_NAME__