From 2a4f70d2fb5592f07ccea14e03df47e91c79d3d3 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Tue, 9 Nov 2021 12:05:11 -0500
Subject: [PATCH] Trying to fix drone 12

---
 .drone.yml | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index e8e5c8749..48e6d40e9 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,11 +9,10 @@ platform:
 steps:
 
   - name: prepare repo
-    image: rust:1.56-alpine
+    image: clux/muslrust:1.56.0
     user: root
     commands:
       - chown 1000:1000 . -R
-      - apk add git
       - git fetch --tags
 
   - name: check formatting
@@ -21,36 +20,33 @@ steps:
     commands:
       - /root/.cargo/bin/cargo fmt -- --check
 
-  # - name: cargo clippy
-  #   image: rust:1.56-alpine
-  #   commands:
-  #     - rustup component add clippy
-  #     - apk add musl-dev openssl-dev postgresql-dev libpq
-  #     - cargo clippy --workspace --tests --all-targets --all-features -- -D warnings -D deprecated -D clippy::perf -D clippy::complexity -D clippy::dbg_macro
-  #     - cargo clippy --workspace -- -D clippy::unwrap_used
+  - name: cargo clippy
+    image: clux/muslrust:1.56.0
+    commands:
+      - cargo clippy --workspace --tests --all-targets --all-features -- -D warnings -D deprecated -D clippy::perf -D clippy::complexity -D clippy::dbg_macro
+      - cargo clippy --workspace -- -D clippy::unwrap_used
 
   - name: cargo test
-    image: rust:1.56-alpine
+    image: clux/muslrust:1.56.0
     environment:
       LEMMY_DATABASE_URL: postgres://lemmy:password@database:5432/lemmy
       LEMMY_CONFIG_LOCATION: ../../config/config.hjson
       RUST_BACKTRACE: 1
       RUST_TEST_THREADS: 1
     commands:
-      - apk add musl-dev openssl-dev postgresql-dev libpq postgresql-client
+      - sudo apt-get update
+      - sudo apt-get -y install --no-install-recommends postgresql-client
       - cargo test --workspace --no-fail-fast
 
   - name: check defaults.hjson updated
-    image: rust:1.56-alpine
+    image: clux/muslrust:1.56.0
     commands:
-      - apk add musl-dev openssl-dev postgresql-dev libpq diffutils sed
       - ./scripts/update_config_defaults.sh config/defaults_current.hjson
       - diff config/defaults.hjson config/defaults_current.hjson
 
   - name: cargo build
-    image: rust:1.56-alpine
+    image: clux/muslrust:1.56.0
     commands:
-      - apk add musl-dev openssl-dev postgresql-dev libpq
       - cargo build
       - mv target/x86_64-unknown-linux-musl/debug/lemmy_server target/lemmy_server