From ef905e9ed65776cc5c87eaead66376197907f399 Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <ameye@chiefsoft.com>
Date: Sat, 15 Oct 2022 21:31:34 +0000
Subject: [PATCH] Jenkins fix

---
 docker-compose.yml       | 7 +++++--
 docker/apache/Dockerfile | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index aa98020..4e42bca 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,9 +7,12 @@ services:
       args:
         uid: ${UID}
     environment:
-      - APACHE_RUN_USER=#${UID}
-      - APACHE_RUN_GROUP=#${UID}
+      - APACHE_RUN_USER=${UID}
+      - APACHE_RUN_GROUP=${UID}
+      - CI_ENV
+      - CI_CONFIG
     restart: unless-stopped
+    image: registry.chiefsoft.net/coregrade-web:latest
     volumes:
       - ./:/var/www/html
       - ./apache_log:/var/log/apache2
diff --git a/docker/apache/Dockerfile b/docker/apache/Dockerfile
index 969281d..d97cc56 100644
--- a/docker/apache/Dockerfile
+++ b/docker/apache/Dockerfile
@@ -1,5 +1,6 @@
 FROM php:7.4-apache
 RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
+RUN apt-get clean
 RUN apt-get update
 RUN apt-get install -y \
     git \
@@ -48,5 +49,7 @@ ARG uid=1000
 RUN useradd -G www-data,root -u $uid -d /home/devuser devuser
 RUN mkdir -p /home/devuser/.composer && \
     chown -R devuser:devuser /home/devuser
+RUN cd /var/www/html && composer install
+RUN chmod -R a+w /var/www/html/writable
 
 EXPOSE 80
\ No newline at end of file