From a4c05002a1ed500b8f61dd2e9a29981fb94fa6cd Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Thu, 13 Apr 2023 10:05:10 +1000
Subject: [PATCH] Ensure docker build updates public/ and remove other
 unnessary files from image

---
 .dockerignore     | 2 ++
 .gitlab-ci.yml    | 2 +-
 docker/Dockerfile | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 99413e1..6089cff 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,7 +2,9 @@
 .editorconfig
 .env.testing
 .git*
+docker/
 package.json
+package-lock.json
 phpunit.xml
 webpack.mix.js
 yarn.lock
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d561d0..6f272b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 cache:
   key: ${CI_COMMIT_REF_SLUG}
   paths:
-  - public/
+  - public/*/vendor/
   - node_modules/
   - vendor/
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f8c8529..02de307 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -7,4 +7,4 @@ RUN mkdir -p ${COMPOSER_HOME} && \
 	touch .composer.refresh && \
 	mv .env.example .env && \
 	FORCE_PERMS=1 NGINX_START=FALSE /sbin/init && \
-	rm -rf ${COMPOSER_HOME}/* composer.lock package-lock.json
+	rm -rf ${COMPOSER_HOME}/* composer.lock