From 4009804221b83a7e56f0e36558cc29a534c92b66 Mon Sep 17 00:00:00 2001
From: "gaul@pdx.edu" <gaul@pdx.edu>
Date: Sat, 2 Oct 2021 10:42:13 -0700
Subject: [PATCH 1/4] Creates non root user to run Meilisearch in Dockerfile

---
 Dockerfile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 322d5a68a..66a3ba484 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,12 +35,18 @@ RUN     $HOME/.cargo/bin/cargo build --release
 # Run
 FROM    alpine:3.14
 
-RUN     apk add -q --no-cache libgcc tini curl
-
-COPY    --from=compiler /meilisearch/target/release/meilisearch .
-
+ARG     USER=meiliuser
+ENV     HOME /home/$USER
 ENV     MEILI_HTTP_ADDR 0.0.0.0:7700
+
+# download runtime deps as root and create $USER
+RUN apk add -q --no-cache libgcc tini curl \
+    && adduser -D $USER
+WORKDIR $HOME
+USER $USER
+# copy file as $USER to $HOME
+COPY  --from=compiler /meilisearch/target/release/meilisearch .
+
 EXPOSE  7700/tcp
 
-ENTRYPOINT ["tini", "--"]
-CMD     ./meilisearch
+CMD ["tini", "--","./meilisearch"]

From 2ef58ccce9a5016f8563f4bfd8c73c5dda322582 Mon Sep 17 00:00:00 2001
From: "gaul@pdx.edu" <gaul@pdx.edu>
Date: Sat, 2 Oct 2021 10:59:01 -0700
Subject: [PATCH 2/4] Fix formatting

---
 Dockerfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 66a3ba484..49f33446f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,16 +36,16 @@ RUN     $HOME/.cargo/bin/cargo build --release
 FROM    alpine:3.14
 
 ARG     USER=meiliuser
-ENV     HOME /home/$USER
+ENV     HOME /home/${USER}
 ENV     MEILI_HTTP_ADDR 0.0.0.0:7700
 
-# download runtime deps as root and create $USER
-RUN apk add -q --no-cache libgcc tini curl \
-    && adduser -D $USER
-WORKDIR $HOME
-USER $USER
-# copy file as $USER to $HOME
-COPY  --from=compiler /meilisearch/target/release/meilisearch .
+# download runtime deps as root and create ${USER}
+RUN     apk add -q --no-cache libgcc tini curl \
+        && adduser -D ${USER}
+WORKDIR ${HOME}
+USER    ${USER}
+# copy file as ${USER} to ${HOME}
+COPY    --from=compiler /meilisearch/target/release/meilisearch .
 
 EXPOSE  7700/tcp
 

From 893654fb157b15c028297fc54919574f80d11687 Mon Sep 17 00:00:00 2001
From: igaul <40813772+igaul@users.noreply.github.com>
Date: Tue, 12 Oct 2021 11:42:08 -0700
Subject: [PATCH 3/4] change default user name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Clémentine Urquizar <clementine@meilisearch.com>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 49f33446f..c5244e301 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,7 @@ RUN     $HOME/.cargo/bin/cargo build --release
 # Run
 FROM    alpine:3.14
 
-ARG     USER=meiliuser
+ARG     USER=meili
 ENV     HOME /home/${USER}
 ENV     MEILI_HTTP_ADDR 0.0.0.0:7700
 

From 7141f89c5f0b0ae6059f38ac20fe70e517ce3289 Mon Sep 17 00:00:00 2001
From: igaul <40813772+igaul@users.noreply.github.com>
Date: Tue, 12 Oct 2021 11:44:59 -0700
Subject: [PATCH 4/4] Split entrypoint and cmd

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index c5244e301..12fc89102 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,4 +49,5 @@ COPY    --from=compiler /meilisearch/target/release/meilisearch .
 
 EXPOSE  7700/tcp
 
-CMD ["tini", "--","./meilisearch"]
+ENTRYPOINT ["tini", "--"]
+CMD     ./meilisearch