Merge pull request 'Update Rust crate tokio to v1.42.0' (#18) from renovate/tokio-1.x-lockfile into main

Reviewed-on: #18

.cargo/config.toml

@@ -1,2 +1,2 @@
 [alias]
-t="test -- --test-threads=1"
+t = "test -- --test-threads=1 --nocapture"

.dockerignore

@@ -1,35 +0,0 @@
-# Include any files or directories that you don't want to be copied to your
-# container here (e.g., local build artifacts, temporary files, etc.).
-#
-# For more help, visit the .dockerignore file reference guide at
-# https://docs.docker.com/engine/reference/builder/#dockerignore-file
-
-**/.DS_Store
-**/.classpath
-**/.dockerignore
-**/.env
-**/.git
-**/.gitignore
-**/.project
-**/.settings
-**/.toolstarget
-**/.vs
-**/.vscode
-**/*.*proj.user
-**/*.dbmdl
-**/*.jfm
-**/charts
-**/docker-compose*
-**/compose*
-**/Dockerfile*
-**/node_modules
-**/npm-debug.log
-**/secrets.dev.yaml
-**/values.dev.yaml
-/bin
-/target
-LICENSE
-README.md
-config.toml
-mastodon-data.toml
-*.yaml

.gitea/workflows/01_test.yaml

@@ -1,5 +1,5 @@
 name: Unit Tests with docker compose and cargo
-on: [push, pull_request]
+on: [push]
 
 jobs:
   unit-test:
@@ -15,8 +15,8 @@ jobs:
       - name: Installing necessary packages
         run: apk add nodejs git curl bash
       - name: Check out repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Get access token from secret
         run: echo "${{ secrets.MASTODON_SECRET }}" > mastodon-data.toml
       - name: Run tests on docker
-        run: docker compose down -v && docker compose run bot t
+        run: docker compose down -v && docker compose run bot t

.gitea/workflows/02_build.yaml

@@ -1,12 +1,12 @@
 name: Build image
 on:
+  pull_request:
+    paths:
+      - .gitea/workflows/02_build.yaml
   push:
-    branches:
-      - main
-      - build
     tags:
       - v*
-      
+
 jobs:
   build:
     container:
@@ -21,32 +21,32 @@ jobs:
       - name: Installing necessary packages
         run: apk add nodejs git curl bash
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Docker meta
         id: meta
-        uses: https://github.com/docker/metadata-action@v4
+        uses: https://github.com/docker/metadata-action@v5
         with:
           # list of Docker images to use as base name for tags
           images: |
             git.fai.st/fedi-image-bot/mastodon-image-uploader-bot
           # generate Docker tags based on the following events/attributes
           tags: |
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=latest
             type=ref,event=branch
-            type=semver,pattern={{raw}}            
+            type=semver,pattern={{raw}}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to fai.st docker registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: git.fai.st
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64,linux/arm64
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,50 +1,32 @@
 # syntax=docker/dockerfile:1
 
-# Comments are provided throughout this file to help you get started.
-# If you need more help, visit the Dockerfile reference guide at
-# https://docs.docker.com/engine/reference/builder/
-
-################################################################################
-# Create a stage for building the application.
-
-ARG RUST_VERSION=1.71.0
-ARG APP_NAME=mastodon-image-uploader-bot
-FROM rust:${RUST_VERSION}-slim-bullseye AS build
-ARG APP_NAME
-WORKDIR /app
+FROM rust:1.83.0-slim-bullseye AS deps
 RUN apt update && apt install pkg-config openssl libssl-dev -y
-# Build the application.
-# Leverage a cache mount to /usr/local/cargo/registry/
-# for downloaded dependencies and a cache mount to /app/target/ for
-# compiled dependencies which will speed up subsequent builds.
-# Leverage a bind mount to the src directory to avoid having to copy the
-# source code into the container. Once built, copy the executable to an
-# output directory before the cache mounted /app/target is unmounted.
-RUN --mount=type=bind,source=src,target=src \
-    --mount=type=bind,source=Cargo.toml,target=Cargo.toml \
-    --mount=type=bind,source=Cargo.lock,target=Cargo.lock \
-    <<EOF
+WORKDIR /app
+COPY src src
+COPY Cargo.toml Cargo.toml
+COPY Cargo.lock Cargo.lock
+
+FROM deps AS test
+COPY .cargo .cargo
+COPY config.toml config.toml
+COPY mastodon-data.toml mastodon-data.toml
+RUN cargo build
+
+FROM deps AS build
+ARG APP_NAME=mastodon-image-uploader-bot
+WORKDIR /app
+RUN <<EOF
 set -e
 cargo build --locked --release
+ls ./target/release/$APP_NAME
 cp ./target/release/$APP_NAME /bin/bot
 EOF
 
-################################################################################
-# Create a new stage for running the application that contains the minimal
-# runtime dependencies for the application. This often uses a different base
-# image from the build stage where the necessary files are copied from the build
-# stage.
-#
-# The example below uses the debian bullseye image as the foundation for running the app.
-# By specifying the "bullseye-slim" tag, it will also use whatever happens to be the
-# most recent version of that tag when you build your Dockerfile. If
-# reproducability is important, consider using a digest
-# (e.g., debian@sha256:ac707220fbd7b67fc19b112cee8170b41a9e97f703f588b2cdbbcdcecdd8af57).
 FROM debian:bullseye-slim AS final
 WORKDIR /app
-RUN apt update && apt install pkg-config openssl libssl-dev curl -y
-# Create a non-privileged user that the app will run under.
-# See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#user
+RUN apt update && apt install pkg-config openssl libssl-dev -y
+
 ARG UID=10001
 RUN adduser \
     --disabled-password \
@@ -54,8 +36,6 @@ RUN adduser \
     botuser
 USER botuser
 
-# Copy the executable from the "build" stage.
 COPY --from=build /bin/bot /bin/
 
-# What the container should run when it is started.
 CMD ["/bin/bot"]

compose.yaml

@@ -1,11 +1,9 @@
-version: "3"
-
 services:
   mongodb:
     image: mongo:bionic
-    container_name: mongodb
+    container_name: mongodb-bot-cron
     ports:
-      - "27017:27017"
+      - 27017:27017
     environment:
       MONGO_INITDB_ROOT_USERNAME: root
       MONGO_INITDB_ROOT_PASSWORD: password
@@ -15,27 +13,25 @@ services:
       - mongodb_data:/data/db
 
   bot-api:
-    image: git.fai.st/fedi-image-bot/bot-api:v1.0.0
-    container_name: bot-api
+    image: git.fai.st/fedi-image-bot/bot-api:v1.0.2
+    container_name: bot-api-bot-cron
     ports:
-      - "8080:8080"
+      - 8080:8080
     depends_on:
       - mongodb
     environment:
-      MONGODB_URI: "mongodb://mongodb:27017/bot"
-      MONGODB_USER: "root"
-      MONGODB_PASS: "password"
-      JWTSECRET: "cooljwtsecret"
+      MONGODB_URI: mongodb://mongodb:27017/bot
+      MONGODB_USER: root
+      MONGODB_PASS: password
+      JWTSECRET: cooljwtsecret
 
   bot:
-    image: rust
-    container_name: bot
-    working_dir: /app
+    build:
+      target: test
     entrypoint: ["cargo"]
+    container_name: bot-cron
     depends_on:
       - bot-api
-    volumes:
-      - ./:/app:rw
 
 volumes:
-  mongodb_data:
+  mongodb_data:

cron.yaml

@@ -1,28 +0,0 @@
-apiVersion: batch/v1beta1
-kind: CronJob
-metadata:
-  name: bot-cronjob
-spec:
-  schedule: "* */6 * * *" # Runs every 6 hours
-  jobTemplate:
-    spec:
-      template:
-        spec:
-          containers:
-            - name: bot-job
-              image: git.fai.st/fedi-image-bot/mastodon-image-uploader-bot:v1.0.0
-              volumeMounts:
-                - name: config-toml
-                  mountPath: /app/config.toml
-                  readOnly: true
-                - name: mastodon-token
-                  mountPath: /app/mastodon-data.toml
-                  readOnly: true
-          restartPolicy: Never
-          volumes:
-            - name: config-toml
-              configMap:
-                name: bot-config-toml
-            - name: mastodon-token
-              secret:
-                secretName: mastodon-data

renovate.json

@@ -0,0 +1,3 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
+}