scope docker credentials

.gitea/workflows/build.yaml

@@ -7,7 +7,7 @@ on:
 env:
   ENDPOINT: services-3
   STACK: mastodon
-  IMAGE: com.devsoap/mastobot
+  IMAGE: docker/mastobot
   TAG: ${{ gitea.ref_name }}
   CACHE_NAME: cache-python-dependencies-mastobot
   RUNNER_TOOL_CACHE: /toolcache
@@ -17,7 +17,7 @@ jobs:
   build-docker-image:
     runs-on: node20
     container:
-      image: catthehacker/ubuntu:act-20.04
+      image: catthehacker/ubuntu:act-24.04
     steps:
       - name: Checkout Docker file
         uses: actions/checkout@v4
@@ -31,14 +31,16 @@ jobs:
           registry: ${{ secrets.DOCKER_REGISTRY }}
           username: ${{ secrets.DOCKER_REGISTRY_USER }}
           password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
+          scope: ${{secrets.DOCKER_REGISTRY}}/${{env.IMAGE}}@push
+          logout: true
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile
           push: true
           build-args: |
-            VERSION=${{env.TAG}}
+            version=${{env.TAG}}
           tags: |
             ${{secrets.DOCKER_REGISTRY}}/${{env.IMAGE}}:${{env.TAG}}
             ${{secrets.DOCKER_REGISTRY}}/${{env.IMAGE}}:latest

Dockerfile

@@ -6,6 +6,7 @@ COPY ./app /code/app
 COPY ./log_config.yml /code/log_config.yml
 ARG version
 ENV VERSION=${version}
+RUN echo "Build Version: $VERSION"
 HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
   CMD wget --spider --quiet --tries=1 --timeout=5 --server-response http://127.0.0.1:8000/health 2>&1 | grep "200 OK" > /dev/null
 CMD ["uvicorn", "main:app", "--app-dir", "app", "--log-config", "log_config.yml", "--host","0.0.0.0", "--port", "8000"]

app/routers/embed.py

@@ -18,10 +18,15 @@ logger = logging.getLogger(__name__)
 
 @router.get("/generate", summary="Embeddable Mastodon Feed")
 async def generate_static_page(settings: Annotated[Settings, Depends(get_settings)]):
-    mastodon_token = settings.feeds['embed']['token']
+
+    mastodon_server = settings.mastodon_server
+    mastodon_aid = settings.feeds['embed']['account_id']
+    mastodon_token = str(settings.feeds['embed']['token'])
+    mastodon_get_statuses_url=f'{mastodon_server}/api/v1/accounts/{mastodon_aid}/statuses'
+
     s3_bucket = settings.feeds['embed']['s3_bucket']
     s3_filename = settings.feeds['embed']['s3_key']
-    mastodon_get_statuses_url=settings.feeds['embed']['url']
+
     try:
         latest_statuses = load_latest_statuses(mastodon_get_statuses_url, mastodon_token, 20)
         latest_statuses = [status for status in latest_statuses if status['in_reply_to_id'] == None]