From 7893574426d06cd263ee7721934235aa8439b8bf Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <ameye@chiefsoft.com>
Date: Sat, 8 Oct 2022 21:36:41 +0000
Subject: [PATCH] Jenkins fixes

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

diff --git a/docker-compose.yml b/docker-compose.yml
index 369c29d..944f87d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,12 +3,13 @@ services:
   wrenchtoken-web:
     build:
       context: .
+      image: registry.chiefsoft.net/wrenchtoken-web:latest
       dockerfile: docker/apache/Dockerfile
       args:
         uid: ${UID}
     environment:
-      - APACHE_RUN_USER=#${UID}
-      - APACHE_RUN_GROUP=#${UID}
+      - APACHE_RUN_USER=${UID}
+      - APACHE_RUN_GROUP=${UID}
     restart: unless-stopped
     volumes:
       - ./:/var/www/html
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