Remove hardcoded ports and adresses

1 files changed, 14 insertions, 12 deletions

diff --git a/docker.yml b/docker.yml
index 806309a..113199d 100644
--- a/docker.yml
+++ b/docker.yml
@@ -22,6 +22,7 @@
     vars:
       server: "{{item.value}}"
     with_items: "{{domains | dict2items}}"
+
   - name: Counter app
     docker_service:
       project_name: app
@@ -31,7 +32,7 @@
           web:
             build: "{{docker_compose_dir}}/app"
             ports:
-             - "127.0.0.1:5004:5000"
+             - "127.0.0.1:{{domains.cnt.proxy.port}}:5000"
             restart: always
           redis:
             image: "redis:alpine"
@@ -48,14 +49,12 @@
             volumes:
             - "/etc/letsencrypt/live/dybiec.info:/etc/letsencrypt/live/dybiec.info:ro"
             - "/etc/letsencrypt/archive/dybiec.info:/etc/letsencrypt/archive/dybiec.info:ro"
-            ports:
-             - "443:443"
-             - "80:80"
             restart: always
 
   - name: gitea
     docker_service:
       project_name: gitea
+      restarted: true
       definition:
         version: '2'
         volumes:
@@ -74,18 +73,18 @@
             volumes:
               - data:/data
             ports:
-              - "127.0.0.1:5001:3000"
-              - "5022:5022"
+              - "127.0.0.1:{{domains.git.proxy.port}}:3000"
+              - "2022:2022"
             environment:
               - DB_TYPE=postgres
               - DB_HOST=db:5432
               - DB_NAME=gitea
               - DB_USER=gitea
               - DB_PASSW=gitea
-              - ROOT_URL=https://git.dybiec.info
+              - "ROOT_URL=https://{{domains.git.name}}"
               - SSH_DOMAIN=git.dybiec.info
-              - SSH_PORT=5022
-              - APP_NAME=git.dybiec.info
+              - SSH_PORT=2022
+              - "APP_NAME={{domains.git.name}}"
               - DISABLE_REGISTRATION=true
               - INSTALL_LOCK=true
               - RUN_MODE=prod
@@ -108,6 +107,7 @@
   - name: grafana
     docker_service:
       project_name: grafana
+      restarted: true
       definition:
         version: '2'
         volumes:
@@ -118,9 +118,9 @@
           grafana:
             image: grafana/grafana
             ports:
-            - "127.0.0.1:5002:3000"
+            - "127.0.0.1:{{domains.grafana.proxy.port}}:3000"
             environment:
-            - GF_SERVER_ROOT_URL=http://grafana.dybiec.info
+            - "GF_SERVER_ROOT_URL=http://{{domains.grafana.name}}"
             - GF_SECURITY_ADMIN_PASSWORD=very_secret
             volumes:
             - "grafana-storage:/var/lib/grafana"
@@ -128,6 +128,8 @@
           prometheus:
             image: prom/prometheus
             expose: [9090]
+            #ports:
+            #  - "127.0.0.1:{{domains.prometheus.proxy.port}}:9090"
             extra_hosts:
             - "dockerhost:172.17.0.1"
             volumes:
@@ -155,7 +157,7 @@
         services:
           registry:
             ports:
-              - "127.0.0.1:5000:5000"
+              - "127.0.0.1:{{domains.registry.proxy.port}}:5000"
             image: registry:2
             volumes:
               - "registry:/var/lib/registry"