From 74497faa6ae6a74f7a8e0310044afd02d870170f Mon Sep 17 00:00:00 2001
From: NilsGrunwald <nilsgrunwald@msn.com>
Date: Tue, 19 Jul 2022 20:31:42 +0200
Subject: [PATCH] Updated versions for docker files

---
 dashy/docker-compose.yml           | 10 ++++--
 gitea/docker-compose.yml           | 50 ++++++++++++++++++------------
 tandoor-recipes/docker-compose.yml |  1 +
 traccar/docker-compose.yml         |  1 +
 4 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/dashy/docker-compose.yml b/dashy/docker-compose.yml
index 7237d3a..ec7d4b2 100644
--- a/dashy/docker-compose.yml
+++ b/dashy/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     # To build from source, replace 'image: lissy93/dashy' with 'build: .'
     # build: .
     image: lissy93/dashy
-    container_name: Dashy
+    container_name: dashy
     # Pass in your config file below, by specifying the path on your host machine
     # volumes:
       # - /root/my-config.yml:/app/public/conf.yml
@@ -25,4 +25,10 @@ services:
       interval: 1m30s
       timeout: 10s
       retries: 3
-      start_period: 40s
\ No newline at end of file
+      start_period: 40s
+    networks:
+      - nginx_network
+      
+networks:
+  nginx_network:
+    driver: bridge 
\ No newline at end of file
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index c6eea67..42ca270 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -1,35 +1,45 @@
-version: '2'
+version: "3"
+
+networks:
+  gitea:
+    external: false
+
 services:
-  web:
-    image: gitea/gitea:latest
+  server:
+    image: gitea/gitea:1.16.9
     container_name: gitea
+    environment:
+      - USER_UID=1000
+      - USER_GID=1000
+      - GITEA__database__DB_TYPE=mysql
+      - GITEA__database__HOST=db:3306
+      - GITEA__database__NAME=gitea
+      - GITEA__database__USER=gitea
+      - GITEA__database__PASSWD=gitea
+    restart: always
+    networks:
+      - gitea
     volumes:
       - gitea_data:/data
     ports:
       - "3000:3000"
-      - "22:22"
+      - "222:22"
     depends_on:
-      - db
-    restart: always
-    networks:
-      - nginx_network
+       - db
+
   db:
-    image: mariadb:10
-    volumes:
-      - gitea_mariadb:/var/lib/mysql
+    image: mysql:8
     restart: always
     environment:
-      - MYSQL_ROOT_PASSWORD=inginf95
-      - MYSQL_DATABASE=gitea
+      - MYSQL_ROOT_PASSWORD=gitea
       - MYSQL_USER=gitea
-      - MYSQL_PASSWORD=inginf95
+      - MYSQL_PASSWORD=gitea
+      - MYSQL_DATABASE=gitea
     networks:
-      - nginx_network
+      - gitea
+    volumes:
+      - gitea_mysql:/var/lib/mysql
       
 volumes:
   gitea_data:
-  gitea_mariadb:    
-  
-networks:
-  nginx_network:
-    driver: bridge   
\ No newline at end of file
+  gitea_mysql:
\ No newline at end of file
diff --git a/tandoor-recipes/docker-compose.yml b/tandoor-recipes/docker-compose.yml
index bb59f1d..64db32a 100644
--- a/tandoor-recipes/docker-compose.yml
+++ b/tandoor-recipes/docker-compose.yml
@@ -22,6 +22,7 @@ services:
 
   nginx_recipes:
     image: nginx:mainline-alpine
+    container_name: tandoor-recipes
     restart: always
     ports:
       - 8095:80
diff --git a/traccar/docker-compose.yml b/traccar/docker-compose.yml
index 0e6a06a..24c032b 100644
--- a/traccar/docker-compose.yml
+++ b/traccar/docker-compose.yml
@@ -3,6 +3,7 @@ version: '3'
 services:
   traccar:
     image: traccar/traccar:latest
+    container_name: traccar
     restart: always
     ports:
       - "8096:8082"