summaryrefslogtreecommitdiff
path: root/docker-compose.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'docker-compose.yaml')
-rw-r--r--docker-compose.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 2bba4ca..845c69b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,7 +6,12 @@ services:
image: luuul/4get:latest
restart: unless-stopped
environment:
+<<<<<<< HEAD
+ - FOURGET_VERSION=6
+ - FOURGET_SERVER_NAME=4get.itinerariummentis.org
+=======
- FOURGET_SERVER_NAME=4get.ca
+>>>>>>> 0b68d6b2a9928d1b9dae389fbf5b95056e678be0
ports:
- "80:80"