From 05ed68db8216647f857ea21ecc63a04b22658dc7 Mon Sep 17 00:00:00 2001
From: "LORENZO\\pacio" <paciotti@poloinformatico.it>
Date: Fri, 20 Jun 2025 16:47:33 +0200
Subject: [PATCH] rev

---
 ...se-single.yml => docker-compose-apache.yml |  0
 docker-compose-psql.yml                       | 32 +++++++++++++++++++
 script_init                                   |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)
 rename docker-compose-single.yml => docker-compose-apache.yml (100%)
 create mode 100644 docker-compose-psql.yml

diff --git a/docker-compose-single.yml b/docker-compose-apache.yml
similarity index 100%
rename from docker-compose-single.yml
rename to docker-compose-apache.yml
diff --git a/docker-compose-psql.yml b/docker-compose-psql.yml
new file mode 100644
index 0000000..e8d8d40
--- /dev/null
+++ b/docker-compose-psql.yml
@@ -0,0 +1,32 @@
+services:
+  postgres:
+    image: postgres:15
+    restart: always
+    environment:
+      POSTGRES_PASSWORD: p0l01nf.
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./postgres/postgres_data:/var/lib/postgresql/data
+      - ./postgres/backup:/backup
+
+  tomcat:
+    build:
+      context: ./tomcat
+      dockerfile: Dockerfile
+      args:
+      #USARE UN UTENTE DEDICATO CON GUID ALTO, 1000 è usato nell'immagine standard tomcat
+        USER_ID: 20000
+        GROUP_ID: 20000
+        USERNAME: adhoc
+        GROUPNAME: adhoc
+    ports:
+      - "2009:8009" #inoltro porta ajp, lasciato errato volontariamente
+    volumes:
+      - ./tomcat/webapps:/usr/local/tomcat/webapps
+      - ./tomcat/logs:/usr/local/tomcat/logs
+    environment:
+      JAVA_OPTS: "-Dfile.encoding=UTF-8 -Xms256m -Xmx2g -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=1g -Djava.security.egd=file:/dev/./urandom -Djava.awt.headless=true"
+      CATALINA_OPTS: "-XX:CompressedClassSpaceSize=512m -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -Xss2m -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:+AlwaysPreTouch -XX:+UseStringDeduplication -XX:ParallelGCThreads=4 -XX:ConcGCThreads=2 -XX:+DisableExplicitGC"
+      TZ: "Europe/Rome"
+    restart: always
diff --git a/script_init b/script_init
index b67e9d5..5b3fdac 100644
--- a/script_init
+++ b/script_init
@@ -1,2 +1,2 @@
 sudo useradd -u 20000 adhoc
-sudo chown -R adhoc:adhoc tomcat
\ No newline at end of file
+sudo chown -R 20000:20000 tomcat
\ No newline at end of file