From eddad46100307b0a76cf49ffa524e8e0ada4c0bf Mon Sep 17 00:00:00 2001
From: toast <toast@toast-server.net>
Date: Tue, 26 Mar 2024 13:04:12 +1100
Subject: [PATCH] Oh, stupidity really shows..

---
 .gitea/workflows/build.yml | 10 ++--------
 Dockerfile                 |  3 +++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 14c6ef6..744c849 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -9,12 +9,6 @@ jobs:
   build:
     runs-on: ubuntu-22.04-node
     steps:
-      - name: "Add Cargo registry"
-        run: |
-          mkdir -p ~/.cargo && \
-          printf '[registries.gitea]\nindex = "sparse+https://git.toast-server.net/api/packages/toast/cargo/"\ntoken = "Bearer %s"\n' "${{ secrets.CARGO_TOKEN }}" >> ~/.cargo/config.toml
-          cat ~/.cargo/config.toml
-
       - name: Set up Docker environment
         run: |
           apt update && apt upgrade -y && apt install -y apt-transport-https ca-certificates curl zstd gnupg lsb-release
@@ -44,8 +38,8 @@ jobs:
           platforms: linux/amd64
           push: true
           tags: git.toast-server.net/toast/kon:main
-          cache-to: type=local,dest=/tmp/.build-cache
-          cache-from: type=local,src=/tmp/.buildx-cache,mode=max
+          build-args: |
+            CARGO_TOKEN=${{ secrets.CARGO_TOKEN }}
 
       - name: Update Delivery
         uses: https://github.com/appleboy/ssh-action@029f5b4aeeeb58fdfe1410a5d17f967dacf36262 # v1.0.3
diff --git a/Dockerfile b/Dockerfile
index b436173..a32d1f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,11 @@
 FROM rust:1.77-alpine3.19@sha256:4a7925c3974fab3fb68b3f4d93d1a4a36cb201f9f87b01014def219b125f1960 AS compiler
 ENV RUSTFLAGS="-C target-feature=-crt-static"
+ARG CARGO_TOKEN
 RUN apk add --no-cache openssl-dev musl-dev 
 WORKDIR /usr/src/kon
 COPY . .
+RUN mkdir -p .cargo && \
+  printf '[registries.gitea]\nindex = "sparse+https://git.toast-server.net/api/packages/toast/cargo/"\ntoken = "Bearer %s"\n' "$CARGO_TOKEN" >> .cargo/config.toml
 RUN cargo fetch && cargo build -r
 
 FROM alpine:3.19@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b