From b76d3b4bd0a963fb64ce6121f9ddec322edd51f1 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Sat, 19 Jul 2025 08:21:37 -0400
Subject: [PATCH] compose file fix

---
 .../composers/A000001/docker-compose.yml      | 26 ++++++++++---------
 .../composers/A000002/docker-compose.yml      | 26 ++++++++++---------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/ANSIBLE/templates/composers/A000001/docker-compose.yml b/ANSIBLE/templates/composers/A000001/docker-compose.yml
index 5adac1f..8458cb5 100644
--- a/ANSIBLE/templates/composers/A000001/docker-compose.yml
+++ b/ANSIBLE/templates/composers/A000001/docker-compose.yml
@@ -1,19 +1,21 @@
-version: '3'
-
+#version: '3'
 services:
   website-WHAT_CONTAINER_NAME:
     container_name: WHAT_CONTAINER_NAME
     #image: yeasy/simple-web
-    image: registry.chiefsoft.com/pweb/pweb-01-merms-pweb0001:latest
+    image: registry.chiefsoft.com/pweb/pweb-01-merms-pweb0002:latest
+    pull_policy: always
     ports:
       - 'ALLOCATED_PORT:80'
     restart: always
-    volumes: ['DESTINATION_FOLDER:/var/www/html']
-    environment:
-      - APACHE_RUN_USER=1000
-      - APACHE_RUN_GROUP=1000
-    networks:
-      - sitenet
-
-networks:
-  sitenet:
+    volumes:
+      - ./writable:/var/www/html/writable:Z
+      - ./apache_log:/var/log/apache2:Z
+#    environment:
+#      - APACHE_RUN_USER=1000
+#      - APACHE_RUN_GROUP=1000
+#    networks:
+#      - sitenet
+#
+#networks:
+#  sitenet:
diff --git a/ANSIBLE/templates/composers/A000002/docker-compose.yml b/ANSIBLE/templates/composers/A000002/docker-compose.yml
index be868e6..8458cb5 100644
--- a/ANSIBLE/templates/composers/A000002/docker-compose.yml
+++ b/ANSIBLE/templates/composers/A000002/docker-compose.yml
@@ -1,19 +1,21 @@
-version: '3'
-
+#version: '3'
 services:
   website-WHAT_CONTAINER_NAME:
     container_name: WHAT_CONTAINER_NAME
     #image: yeasy/simple-web
-    image: registry.chiefsoft.com/pweb/pweb-01-merms-pweb0001:latest
+    image: registry.chiefsoft.com/pweb/pweb-01-merms-pweb0002:latest
+    pull_policy: always
     ports:
       - 'ALLOCATED_PORT:80'
     restart: always
-    volumes: ['DESTINATION_FOLDER:/var/www/html']
-    environment:
-      - APACHE_RUN_USER=1000
-      - APACHE_RUN_GROUP=1000
-    networks:
-      - sitenet
-
-networks:
-  sitenet:
\ No newline at end of file
+    volumes:
+      - ./writable:/var/www/html/writable:Z
+      - ./apache_log:/var/log/apache2:Z
+#    environment:
+#      - APACHE_RUN_USER=1000
+#      - APACHE_RUN_GROUP=1000
+#    networks:
+#      - sitenet
+#
+#networks:
+#  sitenet: