diff --git a/apache/docker-compose.yml b/apache/docker-compose.yml new file mode 100644 index 0000000..6c52092 --- /dev/null +++ b/apache/docker-compose.yml @@ -0,0 +1,9 @@ +services: + apache: + build: + context: ./ + dockerfile: Dockerfile + volumes: + - ./conf/httpd.conf:/usr/local/apache2/conf/httpd.conf + network_mode: host + restart: always \ No newline at end of file diff --git a/docker-compose-apache.yml b/docker-compose-apache.yml deleted file mode 100644 index 2e69011..0000000 --- a/docker-compose-apache.yml +++ /dev/null @@ -1,29 +0,0 @@ -#installazione singolo tenant con apache incluso -services: - 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 - network_mode: host - volumes: - - ./tomcat/webapps:/usr/local/tomcat/webapps - - ./tomcat/logs:/usr/local/tomcat/logs - environment: - JAVA_OPTS: "-Dfile.encoding=UTF-8 -Xms512m -Xmx4g -XX:MetaspaceSize=512m -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 - apache: - build: - context: ./apache - dockerfile: Dockerfile - network_mode: host - depends_on: - - tomcat - restart: always