Docker Container logic updates

.github/workflows/docker-image.yml

@@ -0,0 +1,45 @@
+name: Docker
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "main" ]
+    tags: [ 'v*.*.*' ]
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Log into registry ${{ env.REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: |
+            latest=true
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -4,4 +4,4 @@ COPY ./requirements.txt /app/requirements.txt
 RUN pip install --no-cache-dir --upgrade -r /app/requirements.txt
 RUN mkdir -p /app/artifacts/
 COPY ./find_posts.py /app/
-ENTRYPOINT ["python", "find_posts.py"]
+ENTRYPOINT ["python", "find_posts.py", "-c", "/app/config/config.json"]

README.md

@@ -82,20 +82,16 @@ When using a cronjob, we are using file based locking to avoid multiple overlapp
 > 
 > If you are running FediFetcher locally, my recommendation is to run it manually once, before turning on the cron job: The first run will be significantly slower than subsequent runs, and that will help you prevent overlapping during that first run.
 
-#### To run FediFetcher from a container:
-
-FediFetcher is also available in a pre-packaged container, [FediFetcher](https://github.com/nanos/FediFetcher/pkgs/container/fedifetcher) - Thank you [@nikdoof](https://github.com/nikdoof).
-
-1. Pull the container from `ghcr.io`, using Docker or your container tool of choice: `docker pull ghcr.io/nanos/fedifetcher:latest`
-2. Run the container, passing the configurations options as command line arguments: `docker run -it ghcr.io/nanos/fedifetcher:latest --access-token=<TOKEN> --server=<SERVER>`
-
-> **Note**
-> 
-> The same rules for running this as a cron job apply to running the container: don't overlap any executions.
-
-Persistent files are stored in `/app/artifacts` within the container, so you may want to map this to a local folder on your system.
-
-An [example Kubernetes CronJob](./examples/k8s-cronjob.yaml) for running the container is included in the `examples` folder.
+#### To run FediFetcher from a docker container:
+
+```sh
+docker run -d \
+  --name fedifetcher \
+  --restart unless-stopped \
+  -e TZ=Europe/Bucharest \
+  -v /folder/containing/config_json:/app/config \
+  ghcr.io/rursache/fedifetcher:latest
+```
 
 ### Configuration options
 

find_posts.py

@@ -39,6 +39,9 @@
 argparser.add_argument('--on-done', required = False, default=None, help="Provide a url that will be pinged when processing has completed. You can use this for 'dead man switch' monitoring of your task")
 argparser.add_argument('--on-start', required = False, default=None, help="Provide a url that will be pinged when processing is starting. You can use this for 'dead man switch' monitoring of your task")
 argparser.add_argument('--on-fail', required = False, default=None, help="Provide a url that will be pinged when processing has failed. You can use this for 'dead man switch' monitoring of your task")
+argparser.add_argument('--sleep-interval', required = False, type=int, default=43200, help="The time to wait until it starts fetching again after a successful run")
+
+arguments = argparser.parse_args()
 
 def get_notification_users(server, access_token, known_users, max_age):
     since = datetime.now(datetime.now().astimezone().tzinfo) - timedelta(hours=max_age)
@@ -1237,13 +1240,13 @@ def set_server_apis(server):
 
     server['last_checked'] = datetime.now()
 
-if __name__ == "__main__":
+def main():
+    global arguments
+
     start = datetime.now()
 
     log(f"Starting FediFetcher")
 
-    arguments = argparser.parse_args()
-
     if(arguments.config != None):
         if os.path.exists(arguments.config):
             with open(arguments.config, "r", encoding="utf-8") as f:
@@ -1479,3 +1482,11 @@ def set_server_apis(server):
             except Exception as ex:
                 log(f"Error getting callback url: {ex}")
         raise
+
+if __name__ == "__main__":
+    while True:
+        main()
+
+        sleep_interval = arguments.sleep_interval
+        log(f"Waiting for {sleep_interval} seconds until the next run")
+        time.sleep(sleep_interval)