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 }} 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 \ <