From 0c2ee8a69bbd3e80dedf969173929c4c768bf823 Mon Sep 17 00:00:00 2001
From: Alie <alieneon22@gmail.com>
Date: Fri, 29 Nov 2024 16:35:27 +0100
Subject: [PATCH 1/3] update compose yaml

---
 compose.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/compose.yaml b/compose.yaml
index d0495cc..301bbc8 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   mongodb:
     image: mongo:bionic
@@ -38,4 +36,4 @@ services:
       - ./:/app:rw
 
 volumes:
-  mongodb_data:
\ No newline at end of file
+  mongodb_data:

From 7fb94e17db4d6a953823786a1f25951caf59dd03 Mon Sep 17 00:00:00 2001
From: Alie <alieneon22@gmail.com>
Date: Fri, 29 Nov 2024 16:49:59 +0100
Subject: [PATCH 2/3] fix dockerfile

---
 Dockerfile | 35 +++++------------------------------
 1 file changed, 5 insertions(+), 30 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index de82055..7ef5ce9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,48 +1,25 @@
 # 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 APP_NAME=mastodon-image-uploader-bot
 FROM rust:1.79.0-slim-bullseye AS build
 WORKDIR /app
+ARG APP_NAME=mastodon-image-uploader-bot
+
 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
 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
+
 ARG UID=10001
 RUN adduser \
     --disabled-password \
@@ -52,8 +29,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"]

From 69199c79a66d65325c7311bb21ec45141af09759 Mon Sep 17 00:00:00 2001
From: Alie <alieneon22@gmail.com>
Date: Fri, 29 Nov 2024 19:07:16 +0100
Subject: [PATCH 3/3] change actions

---
 .gitea/workflows/01_test.yaml  |  4 ++--
 .gitea/workflows/02_build.yaml | 11 ++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.gitea/workflows/01_test.yaml b/.gitea/workflows/01_test.yaml
index 49d8729..0c9b7e0 100644
--- a/.gitea/workflows/01_test.yaml
+++ b/.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:
@@ -19,4 +19,4 @@ jobs:
       - 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
\ No newline at end of file
+        run: docker compose down -v && docker compose run bot t
diff --git a/.gitea/workflows/02_build.yaml b/.gitea/workflows/02_build.yaml
index 3bf6b63..b7b6878 100644
--- a/.gitea/workflows/02_build.yaml
+++ b/.gitea/workflows/02_build.yaml
@@ -1,12 +1,9 @@
 name: Build image
 on:
   push:
-    branches:
-      - main
-      - build
     tags:
       - v*
-      
+
 jobs:
   build:
     container:
@@ -31,9 +28,9 @@ jobs:
             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
       - name: Login to fai.st docker registry
@@ -49,4 +46,4 @@ jobs:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
+          labels: ${{ steps.meta.outputs.labels }}