diff options
Diffstat (limited to 'docker-compose.yaml')
-rw-r--r-- | docker-compose.yaml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/docker-compose.yaml b/docker-compose.yaml index 6f9332a..845c69b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -6,8 +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" |