Merge branch 'base' into proxy

update comment
2023-10-25 18:07:00 -04:00 · 2023-10-25 18:05:39 -04:00 · 2022-11-01 14:48:11 -04:00 · 2022-11-01 14:46:58 -04:00 · 2021-04-02 08:41:45 -04:00 · 2021-04-02 08:40:18 -04:00
2 changed files with 2 additions and 5 deletions
--- a/.env
+++ b/.env
@@ -1,5 +1,3 @@
 EXTERNAL_RESOURCE_DIR=~
 PROXY_PROTOCOL=http
 PROXY_HOST=localhost
 PROXY_PORT=8080
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,6 @@
-# Sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
+# Originally sourced from https://github.com/Alfresco/acs-deployment/blob/4.0.3/docker-compose/docker-compose.yml
 #
-# Using version 2 as 3 does not support resource constraint options (cpu_*, mem_* limits) for non swarm mode in Compose
+version: "3"
 version: "2"
 services:
    proxy:
Author	SHA1	Message	Date
Brian M. Long	241a3e47ea	Merge branch 'base' into proxy	2023-10-25 18:07:00 -04:00
Brian M. Long	c2a9679ede	update comment	2023-10-25 18:05:39 -04:00
Brian M. Long	9e1a819e8b	Merge branch 'base' into proxy	2022-11-01 14:48:11 -04:00
Brian M. Long	10e7f81163	advancing to docker v3	2022-11-01 14:46:58 -04:00
Brian Long	3d6aa1d4bc	Merge branch 'base' into proxy	2021-04-02 08:41:45 -04:00
Brian Long	91ad3afc0a	removed external dir	2021-04-02 08:40:18 -04:00