From 2784bb62c0c2e3884be29d76040a0df6a3e1f060 Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <ameye@chiefsoft.com>
Date: Sat, 8 Oct 2022 22:22:05 +0000
Subject: [PATCH] Jenkins fix

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

diff --git a/.env b/.env
index 727240b..0c0d07c 100644
--- a/.env
+++ b/.env
@@ -14,7 +14,7 @@
 # ENVIRONMENT
 #--------------------------------------------------------------------
 UID=1011
-CI_ENVIRONMENT = production
+CI_ENVIRONMENT=production
 
 #--------------------------------------------------------------------
 # APP
diff --git a/docker-compose.yml b/docker-compose.yml
index df7c79d..3e38c91 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,15 +1,16 @@
 version: '3'
 services:
-  web:
+  merms-web:
     build:
       context: .
       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
+    image: registry.chiefsoft.net/merms-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