Merge pull request #9 from cevans-montala/patch-1

Update docker-compose.yaml

.gitattributes

@@ -0,0 +1 @@
+*.sh text eol=lf

Dockerfile

@@ -49,9 +49,15 @@ ADD cronjob /etc/cron.daily/resourcespace
 WORKDIR /var/www/html
 
 RUN rm -f index.html \
- && svn co -q https://svn.resourcespace.com/svn/rs/releases/10.5 . \
+ && svn co -q https://svn.resourcespace.com/svn/rs/releases/10.6 . \
  && mkdir -p filestore \
  && chmod 777 filestore \
  && chmod -R 777 include/
+ 
 
-CMD apachectl -D FOREGROUND
+# Copy custom entrypoint script
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+# Start both cron and Apache
+CMD ["/entrypoint.sh"]

docker-compose.yaml

@@ -6,9 +6,8 @@ services:
     depends_on:
       - mariadb
     volumes:
-      - include:/var/www/html/include
       - filestore:/var/www/html/filestore
-      - ./testdir:/srv/storage/testdir
+      - ./config.php:/var/www/html/include/config.php
     networks:
       - frontend
       - backend
@@ -32,5 +31,4 @@ networks:
 
 volumes:
   mariadb:
-  include:
   filestore:

entrypoint.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Start cron service
+service cron start
+
+# Ensure daily cron jobs are executable
+chmod +x /etc/cron.daily/*
+
+# Start Apache in the foreground (keeps the container alive)
+apachectl -D FOREGROUND