From 067bd218e3ff777ad5f1784d441d363668413fa5 Mon Sep 17 00:00:00 2001
From: Ian Burgwin <ian@ianburgwin.net>
Date: Tue, 6 Oct 2020 21:22:52 -0700
Subject: [PATCH] clean up image build

---
 .dockerignore | 3 +++
 Dockerfile    | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index d872363ff..1f3effc2a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,8 @@
 data
 .git
+.github
+.gitignore
+.travis.yml
 .dockerignore
 Dockerfile
 config.ini
diff --git a/Dockerfile b/Dockerfile
index 708feb45c..9e0262c92 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 FROM python:3.8.6-slim-buster
 LABEL org.opencontainers.image.source https://github.com/nh-server/Kurisu
+ENV IS_DOCKER=1
 ENV HOME /home/kurisu
 RUN useradd -m -d $HOME -s /bin/sh -u 2849 kurisu
 WORKDIR $HOME
 COPY ./requirements.txt .
 RUN pip install --no-cache-dir -r requirements.txt
-ENV IS_DOCKER=1
-ARG COMMIT="unknown"
+USER kurisu
 ARG BRANCH="unknown"
-ENV COMMIT_SHA=${COMMIT}
 ENV COMMIT_BRANCH=${BRANCH}
-USER kurisu
+ARG COMMIT="unknown"
+ENV COMMIT_SHA=${COMMIT}
 COPY --chown=2849:2849 . .
 CMD ["python3", "kurisu.py"]