Move Git SHA defining at end of Dockerfile to re-enable caching

Defining SHA at the beginning of build breaks caching, so this should be avoided.

1 files changed, 7 insertions, 5 deletions

diff --git a/Dockerfile b/Dockerfile
index 5d0380b44..994b8ee49 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,10 @@
 FROM python:3.8-slim
 
-# Define Git SHA build argument
-ARG git_sha="development"
-
 # Set pip to have cleaner logs and no saved cache
 ENV PIP_NO_CACHE_DIR=false \
     PIPENV_HIDE_EMOJIS=1 \
     PIPENV_IGNORE_VIRTUALENVS=1 \
-    PIPENV_NOSPIN=1 \
-    GIT_SHA=$git_sha
+    PIPENV_NOSPIN=1
 
 RUN apt-get -y update \
     && apt-get install -y \
@@ -25,6 +21,12 @@ WORKDIR /bot
 COPY Pipfile* ./
 RUN pipenv install --system --deploy
 
+# Define Git SHA build argument
+ARG git_sha="development"
+
+# Set Git SHA environment variable here to enable caching
+ENV GIT_SHA=$git_sha
+
 # Copy the source code in last to optimize rebuilding the image
 COPY . .