From e853919de23918aa701a4a2a302c454974ff8d71 Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Wed, 9 Mar 2022 07:04:58 -0500
Subject: [PATCH] Fix Docker build

---
 .dockerignore | 1 +
 Dockerfile    | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.dockerignore b/.dockerignore
index 3d889cfd..3f5a2297 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -10,6 +10,7 @@ tests
 .styleci.yml
 .travis.yml
 changelog.md
+docker/README.md
 Dockerfile
 LICENSE
 README.md
diff --git a/Dockerfile b/Dockerfile
index 96b8e6fe..024c0bfe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,11 +5,16 @@ ARG PHP_VERSION=7.3-alpine${ALPINE_VERSION}
 ARG COMPOSER_VERSION=2.1
 ARG SUPERVISORD_VERSION=v0.7.3
 
+ARG UID=1000
+ARG GID=1000
+
 FROM --platform=${BUILDPLATFORM} composer:${COMPOSER_VERSION} AS build-composer
 FROM composer:${COMPOSER_VERSION} AS composer
 FROM qmcgaw/binpot:supervisord-${SUPERVISORD_VERSION} AS supervisord
 
 FROM --platform=${BUILDPLATFORM} php:${PHP_VERSION} AS vendor
+ARG UID=1000
+ARG GID=1000
 COPY --from=build-composer --chown=${UID}:${GID} /usr/bin/composer /usr/bin/composer
 RUN apk add --no-cache unzip
 WORKDIR /srv
@@ -26,7 +31,6 @@ RUN php artisan key:generate
 ENTRYPOINT [ "/srv/vendor/bin/phpunit" ]
 
 FROM alpine:${ALPINE_VERSION}
-
 ARG UID=1000
 ARG GID=1000