fixed volumes

templates/gitea/0/docker-compose.yml.tpl

@@ -3,12 +3,12 @@ services:
   gitea:
     image: gitea/gitea:1.3.0-rc1
     volumes:
-      - gitea-data-git:/data/git
-      - gitea-data-ssh:/data/ssh
-      - gitea-data-conf:/data/gitea/lfs
-      - gitea-data-lfs:/data/gitea/lfs
-      - gitea-data-log:/data/gitea/log
-      - gitea-data-sessions:/data/gitea/sessions
+      - ${data_path}/git:/data/git
+      - ${data_path}/ssh:/data/ssh
+      - ${data_path}/gitea/conf:/data/gitea/lfs
+      - ${data_path}/gitea/lfs:/data/gitea/lfs
+      - ${data_path}/gitea/log:/data/gitea/log
+      - ${data_path}/gitea/sessions:/data/gitea/sessions
 
 {{- if ne .Values.db_link ""}}
     external_links:
@@ -22,28 +22,10 @@ services:
       MYSQL_ROOT_PASSWORD: ${mysql_password}
       MYSQL_DATABASE: 'gitea'
     volumes:
-      - gitea-db:/var/lib/mysql
+      - ${data_path}/gitea/db:/var/lib/mysql
 {{- end}}
   lb:
     image: rancher/lb-service-haproxy:v0.7.9
     ports:
     - ${http_port}:${http_port}/tcp
     - ${ssh_port}:${ssh_port}/tcp
-volumes:
-  gitea-data-git:
-    driver: ${volume_driver}
-  gitea-data-ssh:
-    driver: ${volume_driver}
-  gitea-data-conf:
-    driver: ${volume_driver}
-  gitea-data-lfs:
-    driver: ${volume_driver}
-  gitea-data-log:
-    driver: ${volume_driver}
-  gitea-data-sessions:
-    driver: ${volume_driver}
-{{- if eq .Values.db_link ""}}
-  gitea-db:
-    driver: ${volume_driver}
-{{- end}}
-