From fe3b42830e9f785a9f78b058dec8c27e6ebd5966 Mon Sep 17 00:00:00 2001 From: Drew Galbraith Date: Tue, 25 Nov 2025 22:00:20 -0800 Subject: [PATCH 1/2] Move build process to podman --- .forgejo/workflows/docker.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/docker.yml b/.forgejo/workflows/docker.yml index 7fee464..3003449 100644 --- a/.forgejo/workflows/docker.yml +++ b/.forgejo/workflows/docker.yml @@ -2,7 +2,7 @@ name: Docker Build on: push: - branches: [ main ] + branches: [ main, docker ] jobs: docker-backend: @@ -11,8 +11,10 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 - - run: | - apt update && apt install -y docker.io + - name: Install Docker + run: | + curl -fsSL https://get.docker.com -o get-docker.sh + sh get-docker.sh - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Login to Forgejo Container Registry @@ -31,8 +33,10 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 - - run: | - apt update && apt install -y docker.io + - name: Install Docker + run: | + curl -fsSL https://get.docker.com -o get-docker.sh + sh get-docker.sh - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Login to Forgejo Container Registry From 220bca6edb2c369be340f606d0961324ce305dff Mon Sep 17 00:00:00 2001 From: Drew Galbraith Date: Tue, 25 Nov 2025 22:00:20 -0800 Subject: [PATCH 2/2] Move build process to podman --- .forgejo/workflows/docker.yml | 14 +++++++++----- backend/Dockerfile | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/docker.yml b/.forgejo/workflows/docker.yml index 7fee464..3003449 100644 --- a/.forgejo/workflows/docker.yml +++ b/.forgejo/workflows/docker.yml @@ -2,7 +2,7 @@ name: Docker Build on: push: - branches: [ main ] + branches: [ main, docker ] jobs: docker-backend: @@ -11,8 +11,10 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 - - run: | - apt update && apt install -y docker.io + - name: Install Docker + run: | + curl -fsSL https://get.docker.com -o get-docker.sh + sh get-docker.sh - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Login to Forgejo Container Registry @@ -31,8 +33,10 @@ jobs: steps: - name: Checkout Repo uses: actions/checkout@v4 - - run: | - apt update && apt install -y docker.io + - name: Install Docker + run: | + curl -fsSL https://get.docker.com -o get-docker.sh + sh get-docker.sh - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - name: Login to Forgejo Container Registry diff --git a/backend/Dockerfile b/backend/Dockerfile index 6ce2a7e..54f4b34 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -25,7 +25,7 @@ COPY src/ src/ COPY migrations/ migrations/ # Build the application -RUN cargo build --release +RUN --mount=source=.sqlx,target=.sqlx cargo build --release # Runtime stage FROM alpine:latest