From cfd9849604cf186f51ba202fcc5b96731d6f8797 Mon Sep 17 00:00:00 2001
From: Nathan Fiedler <nathanfiedler@fastmail.fm>
Date: Tue, 3 Aug 2021 19:00:19 -0700
Subject: [PATCH] docker: copy to avoid local host dependency

---
 docker/Dockerfile         | 12 +++++++++---
 docker/docker-compose.yml |  6 ++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a206d93..d08e7a6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,10 +14,16 @@ RUN curl https://download.imagemagick.org/ImageMagick/download/ImageMagick.tar.g
  && cd .. \
  && rm -r ImageMagick-${MAGICK_VERSION}*
 
+WORKDIR /magick
+COPY build.rs .
+COPY Cargo.toml .
+COPY src src
+COPY tests tests
+
 RUN adduser --disabled-password --gecos '' magick-rust
+RUN chown -R magick-rust .
 
 USER magick-rust
 
-ENV USER=magick-rust LD_LIBRARY_PATH=/usr/local/lib
-
-WORKDIR /src
+ENV USER=magick-rust
+ENV LD_LIBRARY_PATH=/usr/local/lib
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index f5e6b3b..21f5c15 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -3,9 +3,7 @@ version: '3'
 services:
   magick-rust:
     build:
-      context: .
-      dockerfile: Dockerfile
-    volumes:
-      - ..:/src
+      context: ..
+      dockerfile: docker/Dockerfile
     stdin_open: true
     tty: true