From 6ca5f002145a9d3381851520781e7d0b72dbc7cd Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Wed, 7 Apr 2021 18:42:15 +0200
Subject: [PATCH] fix docker tags, remove cargo-chef

---
 .drone.yml             |  4 ++--
 docker/prod/Dockerfile | 32 +-------------------------------
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index cbe2470b2..732d62409 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -65,7 +65,7 @@ steps:
         from_secret: docker_password
       repo: dessalines/lemmy
       tags:
-      - dev
+      - dev-linux-amd64
     when:
       branch:
       - main
@@ -184,7 +184,7 @@ steps:
         from_secret: docker_password
       repo: dessalines/lemmy
       tags:
-      - dev
+      - dev-linux-arm64
     when:
       branch:
       - main
diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
index 2ad601aec..75c53e675 100644
--- a/docker/prod/Dockerfile
+++ b/docker/prod/Dockerfile
@@ -1,38 +1,11 @@
-ARG RUST_BUILDER_IMAGE=ekidd/rust-musl-builder:1.50.0
-
-# Cargo chef plan
-FROM $RUST_BUILDER_IMAGE as planner
-WORKDIR /app
-RUN cargo install cargo-chef
-
-# Copy dirs
-COPY ./ ./
-
-RUN sudo chown -R rust:rust .
-RUN cargo chef prepare --recipe-path recipe.json
-
-# Cargo chef cache dependencies
-FROM $RUST_BUILDER_IMAGE as cacher
-ARG CARGO_BUILD_TARGET=x86_64-unknown-linux-musl
-WORKDIR /app
-RUN cargo install cargo-chef
-COPY --from=planner /app/recipe.json ./recipe.json
-RUN sudo chown -R rust:rust .
-RUN cargo chef cook --release --target ${CARGO_BUILD_TARGET} --recipe-path recipe.json
-
 # Build the project
-FROM $RUST_BUILDER_IMAGE as builder
+FROM ekidd/rust-musl-builder:1.50.0 as builder
 
 ARG CARGO_BUILD_TARGET=x86_64-unknown-linux-musl
 ARG RUSTRELEASEDIR="release"
 
 WORKDIR /app
 
-# Copy over the cached dependencies
-COPY --from=cacher /app/target target
-COPY --from=cacher /home/rust/.cargo /home/rust/.cargo
-
-# Copy the rest of the dirs
 COPY ./ ./
 
 RUN sudo chown -R rust:rust .
@@ -49,9 +22,6 @@ FROM alpine:3.12 as lemmy
 # Install libpq for postgres
 RUN apk add libpq
 
-# Install Espeak for captchas
-RUN apk add espeak
-
 RUN addgroup -g 1000 lemmy
 RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy