From d5126796493253a3556dafb72121ae7e816cb127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Fernandes?= <marcio.fernandes@outlook.pt>
Date: Mon, 25 Oct 2021 20:02:36 +0100
Subject: [PATCH] docker compose variables

---
 .gitignore                         | 1 +
 docker-compose/docker-compose.yaml | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5966c57..76eed51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 **/.env
+**/_volumes/*
\ No newline at end of file
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index 013d4e3..bc7f5cb 100644
--- a/docker-compose/docker-compose.yaml
+++ b/docker-compose/docker-compose.yaml
@@ -16,10 +16,10 @@ services:
       - GITEA__database__PASSWD=${GITEA_DB_PASSWORD}
     restart: always
     volumes:
-      - /data/docker-volumes/gitea/gitea_data:/data
+      - ${GITEA_VOLUME_DATA}:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-      - /backups/services/gitea:/tmp/backups
+      - ${GITEA_VOLUME_BACKUPS}:/tmp/backups
     #ports:
     #  - "80:3000"
     #- "22:22"
@@ -27,17 +27,16 @@ services:
       - db
     networks:
       macvlan:
-         ipv4_address: 192.168.1.248
+         ipv4_address: ${GITEA_MACVLAN_IP}
       gitea_network:  
   db:
     image: tobi312/rpi-mariadb:10.5-ubuntu
     container_name: gitea_mariadb
     restart: always
     volumes:
-      - /data/docker-volumes/gitea/gitea_mariadb:/var/lib/mysql
+      - ${GITEA_VOLUME_DATABASE}:/var/lib/mysql
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-    environment:
       - MYSQL_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD}
       - MYSQL_USER=${GITEA_DB_USER}
       - MYSQL_PASSWORD=${GITEA_DB_PASSWORD}