From 6f146ab47dc2cce7e7e012ebc93b42f9294f5132 Mon Sep 17 00:00:00 2001
From: Xbird <xbird.xbird@gmail.com>
Date: Fri, 23 Sep 2022 19:09:37 +0000
Subject: [PATCH] Work on cleaning docker image

---
 .dockerignore      | 34 +++++++++++++++++++++++++++++++++-
 .gitlab-ci.yml     |  4 ----
 Dockerfile         |  4 +---
 docker/docker.sh   |  1 +
 visionversion.json |  2 +-
 5 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index a37b360..20d8770 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +1,33 @@
-**/.env.local
\ No newline at end of file
+**/*.log
+**/*.md
+**/*.php~
+**/*.dist.php
+**/*.dist
+**/*.cache
+**/._*
+**/.dockerignore
+**/.DS_Store
+**/.git/
+**/.gitattributes
+**/.gitignore
+**/.gitmodules
+**/docker-compose.*.yaml
+**/docker-compose.*.yml
+**/docker-compose.yaml
+**/docker-compose.yml
+**/Dockerfile
+**/Thumbs.db
+.github/
+.gitlab/
+docs/
+public/bundles/
+public/build/
+tests/
+var/
+vendor/
+.editorconfig
+.env.*.local
+.env.local
+.env.local.php
+.env.test
+node_modules/
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2283ee3..14e6f89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,10 +6,6 @@ include:
 before_script:
     - composer install --no-scripts
 
-cache:
-    paths:
-        - vendor/
-
 stages:
     - SecurityChecker
     - CodingStandards
diff --git a/Dockerfile b/Dockerfile
index cfd1f45..4ec7493 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,9 +23,7 @@ RUN chown -R www-data:www-data /var/www
 
 USER www-data
 
-RUN cd /var/www && \
-    composer install
-    
+RUN cd /var/www
 WORKDIR /var/www/
 
 ENTRYPOINT ["bash", "./docker/docker.sh"]
diff --git a/docker/docker.sh b/docker/docker.sh
index 1fc7e12..3b4279d 100644
--- a/docker/docker.sh
+++ b/docker/docker.sh
@@ -1,3 +1,4 @@
+composer install
 php bin/console d:m:m --no-interaction
 php bin/console cache:clear
 exec apache2-foreground
\ No newline at end of file
diff --git a/visionversion.json b/visionversion.json
index c56effc..a7d4f79 100644
--- a/visionversion.json
+++ b/visionversion.json
@@ -1,3 +1,3 @@
 {
-  "version": "0.2.10"
+  "version": "0.2.11"
 }