Force creation of empty temp and log dirs in assembly descriptors (#2…

…7412)
dotCMS · Jan 23, 2024 · c594754 · c594754
1 parent 018dec3
commit c594754
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/dotCMS/src/assembly/descriptor.xml b/dotCMS/src/assembly/descriptor.xml
@@ -37,6 +37,20 @@
             <fileMode>0755</fileMode>
             <directoryMode>0755</directoryMode>
         </fileSet>
+        <fileSet>
+            <directory>${assembly-directory}/conf</directory>
+            <outputDirectory>temp</outputDirectory>
+            <excludes>
+                <exclude>**/*</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${assembly-directory}/conf</directory>
+            <outputDirectory>/logs</outputDirectory>
+            <excludes>
+                <exclude>**/*</exclude>
+            </excludes>
+        </fileSet>
         <fileSet>
             <directory>${assembly-directory}</directory>
             <outputDirectory></outputDirectory>
@@ -47,7 +61,6 @@
                 <exclude>**/felix-cache/**</exclude>
                 <exclude>**/webapps/cargorpc/**</exclude>
                 <exclude>**/work/**</exclude>
-                <exclude>**/temp/**</exclude>
                 <exclude>**/logs/**</exclude>
                 <exclude>**/lib/**</exclude>
                 <exclude>**/shared/**</exclude>

diff --git a/dotCMS/src/main/docker/original/docker-descriptor.xml b/dotCMS/src/main/docker/original/docker-descriptor.xml
@@ -4,6 +4,21 @@
     <includeBaseDirectory>false</includeBaseDirectory>
 
     <fileSets>
+        <!-- hack to make sure these empty directories get included-->
+        <fileSet>
+            <directory>${assembly-directory}/dotserver/tomcat-${tomcat.version}/config</directory>
+            <outputDirectory>dotserver/tomcat-${tomcat.version}/temp</outputDirectory>
+            <excludes>
+                <exclude>**/*</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${assembly-directory}/dotserver/tomcat-${tomcat.version}/config</directory>
+            <outputDirectory>dotserver/tomcat-${tomcat.version}/logs</outputDirectory>
+            <excludes>
+                <exclude>**/*</exclude>
+            </excludes>
+        </fileSet>
 
         <fileSet>
             <directory>${assembly-directory}/dotserver/tomcat-${tomcat.version}</directory>
@@ -15,7 +30,6 @@
                 <exclude>**/felix-cache/**</exclude>
                 <exclude>**/webapps/cargorpc/**</exclude>
                 <exclude>**/work/**</exclude>
-                <exclude>**/temp/**</exclude>
                 <exclude>**/logs/**</exclude>
             </excludes>
         </fileSet>