From 73d763258017310e306e22a0f2c7b06edd443dc7 Mon Sep 17 00:00:00 2001
From: Paweł Dybiec <pawel.to.malpa@gmail.com>
Date: Fri, 19 Apr 2019 19:59:21 +0200
Subject: Fix paths/ports, update versions

---
 docker.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/docker.yml b/docker.yml
index d243a95..4b3e068 100644
--- a/docker.yml
+++ b/docker.yml
@@ -70,32 +70,35 @@
             external: false
         services:
           web:
-            image: gitea/gitea
+            image: gitea/gitea:latest
             volumes:
               - data:/data
             ports:
               - "127.0.0.1:{{domains.git.proxy.port}}:3000"
-              - "2022:2022"
+              - "2022:22"
             environment:
               - DB_TYPE=postgres
               - DB_HOST=db:5432
               - DB_NAME=gitea
               - DB_USER=gitea
               - "DB_PASSW={{gitea_db_password}}"
+              - HTTP_PORT=3000
               - "ROOT_URL=https://{{domains.git.name}}"
               - SSH_DOMAIN=git.dybiec.info
               - SSH_PORT=2022
               - "APP_NAME={{domains.git.name}}"
-              - DISABLE_REGISTRATION=true
+              - DISABLE_REGISTRATION=false
               - INSTALL_LOCK=true
               - RUN_MODE=prod
+              - OFFLINE_MODE=true
+              - DEFAULT_THEME=arc-green
             networks:
               - gitea
             depends_on:
               - db
             restart: always
           db:
-            image: postgres:9.6
+            image: postgres:11
             restart: always
             environment:
               - POSTGRES_USER=gitea
@@ -104,13 +107,13 @@
             networks:
               - gitea
             volumes:
-              - db/:/var/lib/mysql
+              - db/:/var/lib/postgresql/data
   - name: grafana
     docker_service:
-      project_name: grafana
+      project_name: monitoring
       restarted: true
       definition:
-        version: '2'
+        version: '3'
         volumes:
           grafana-storage:
             external:
@@ -150,7 +153,7 @@
     docker_service:
       project_name: registry
       definition:
-        version: '2'
+        version: '3'
         volumes:
           registry:
             external:
@@ -172,7 +175,7 @@
     docker_service:
       project_name: vpn
       definition:
-        version: '2'
+        version: '3'
         volumes:
           openvpn-certs:
             external:
-- 
cgit 1.4.1