From 58878c6c10bcec320b1c22c518c3cd487928b122 Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <ameye@chiefsoft.com>
Date: Sun, 18 Aug 2024 01:01:19 +0000
Subject: [PATCH 1/2] Registry

---
 .gitignore         | 20 ++++++++++++++++++++
 docker-compose.yml |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7f5d1ff
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,20 @@
+*/config/development
+*/logs/log-*.php
+!*/logs/index.html
+*/cache/*
+!system/cache/*
+!*/cache/index.html
+!*/cache/.htaccess
+
+user_guide_src/build/*
+user_guide_src/cilexer/build/*
+user_guide_src/cilexer/dist/*
+user_guide_src/cilexer/pycilexer.egg-info/*
+
+#codeigniter 3
+application/logs/*
+!application/logs/index.html
+!application/logs/.htaccess
+/vendor/
+
+apache_log/*
diff --git a/docker-compose.yml b/docker-compose.yml
index aceb143..e5f3f93 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,7 @@
 version: '3'
 services:
   merms-panel:
+    image: registry.chiefsoft.net/merms-panel:latest
     build:
       context: .
       dockerfile: docker/apache/Dockerfile

From c9b009ab43dfd91b2a7278e11eed2e683c1f1fc6 Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <ameye@chiefsoft.com>
Date: Sun, 18 Aug 2024 01:02:37 +0000
Subject: [PATCH 2/2] Ignore?

---
 .gitignore           | 2 ++
 apache_log/error.log | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7f5d1ff..f377d72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ application/logs/*
 /vendor/
 
 apache_log/*
+apache_log/error.log
+
diff --git a/apache_log/error.log b/apache_log/error.log
index c19e165..e69de29 100644
--- a/apache_log/error.log
+++ b/apache_log/error.log
@@ -1,4 +0,0 @@
-[Tue Aug 13 15:21:53.990280 2024] [mpm_prefork:notice] [pid 1:tid 1] AH00163: Apache/2.4.61 (Debian) PHP/8.1.29 configured -- resuming normal operations
-[Tue Aug 13 15:21:53.990816 2024] [core:notice] [pid 1:tid 1] AH00094: Command line: 'apache2 -D FOREGROUND'
-[Thu Aug 15 00:59:26.087579 2024] [mpm_prefork:notice] [pid 1:tid 1] AH00163: Apache/2.4.61 (Debian) PHP/8.1.29 configured -- resuming normal operations
-[Thu Aug 15 00:59:26.088145 2024] [core:notice] [pid 1:tid 1] AH00094: Command line: 'apache2 -D FOREGROUND'