From 13ad2c5148a12a34931e6521d334190e3e475e83 Mon Sep 17 00:00:00 2001 From: Andreas Knuth Date: Mon, 20 May 2024 10:34:46 -0500 Subject: [PATCH] added container_names & removed stuff --- app/docker-compose.yml | 1 + caddy/docker-compose.yml | 1 + gitea/docker-compose.yml | 2 ++ keycloak/docker-compose.yml | 2 ++ nginx_proxy_manager/docker-compose.yml | 46 -------------------------- redis/docker-compose.yml | 19 ----------- redis/redis.conf | 13 -------- 7 files changed, 6 insertions(+), 78 deletions(-) delete mode 100644 nginx_proxy_manager/docker-compose.yml delete mode 100644 redis/docker-compose.yml delete mode 100644 redis/redis.conf diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 6c88db2..8d42936 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -3,6 +3,7 @@ version: '3.8' services: postgres: + container_name: postgres_app image: postgres:15.5-alpine3.19 volumes: - bizmatch_volume:/var/lib/postgresql/data diff --git a/caddy/docker-compose.yml b/caddy/docker-compose.yml index 962cb3d..2feec65 100644 --- a/caddy/docker-compose.yml +++ b/caddy/docker-compose.yml @@ -1,6 +1,7 @@ version: '3.7' services: caddy: + container_name: caddy image: iarekylew00t/caddy-cloudflare:latest restart: unless-stopped ports: diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml index d08390e..69caa18 100644 --- a/gitea/docker-compose.yml +++ b/gitea/docker-compose.yml @@ -2,6 +2,7 @@ version: '3.1' services: server: + container_name: gitea image: gitea/gitea:latest environment: - USER_UID=115 @@ -25,6 +26,7 @@ services: - "2222:22" db: + container_name: postgres_gitea image: postgres:alpine environment: - POSTGRES_USER=bizmatch diff --git a/keycloak/docker-compose.yml b/keycloak/docker-compose.yml index ae0a06c..c34d684 100644 --- a/keycloak/docker-compose.yml +++ b/keycloak/docker-compose.yml @@ -3,6 +3,7 @@ version: '3.8' services: postgres: + container_name: postgres_keycloak image: postgres:15.5-alpine3.19 volumes: - postgres_volume:/var/lib/postgresql/data @@ -14,6 +15,7 @@ services: - bizmatch auth: + container_name: keycloak image: quay.io/keycloak/keycloak:latest ports: - "8080:8080" diff --git a/nginx_proxy_manager/docker-compose.yml b/nginx_proxy_manager/docker-compose.yml deleted file mode 100644 index 3fc1853..0000000 --- a/nginx_proxy_manager/docker-compose.yml +++ /dev/null @@ -1,46 +0,0 @@ -version: '3.8' -services: - app: - image: 'jc21/nginx-proxy-manager:latest' - restart: unless-stopped - ports: - # These ports are in format : - - '80:80' # Public HTTP Port - - '443:443' # Public HTTPS Port - - '81:81' # Admin Web Port - # Add any other Stream port you want to expose - # - '21:21' # FTP - environment: - # Mysql/Maria connection parameters: - DB_MYSQL_HOST: "db" - DB_MYSQL_PORT: 3306 - DB_MYSQL_USER: "bizmatch" - DB_MYSQL_PASSWORD: "$(WT0HW=^(" - DB_MYSQL_NAME: "nginx_proxy_manager" - # Uncomment this if IPv6 is not enabled on your host - # DISABLE_IPV6: 'true' - networks: - - bizmatch - volumes: - - ./data:/data - - ./letsencrypt:/etc/letsencrypt - depends_on: - - db - - db: - image: 'jc21/mariadb-aria:latest' - restart: unless-stopped - environment: - MYSQL_ROOT_PASSWORD: 'KG}gwweb' - MYSQL_DATABASE: 'nginx_proxy_manager' - MYSQL_USER: 'bizmatch' - MYSQL_PASSWORD: '$(WT0HW=^(' - MARIADB_AUTO_UPGRADE: '1' - volumes: - - ./mysql:/var/lib/mysql - networks: - - bizmatch - -networks: - bizmatch: - external: true \ No newline at end of file diff --git a/redis/docker-compose.yml b/redis/docker-compose.yml deleted file mode 100644 index d0eedf6..0000000 --- a/redis/docker-compose.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: "3.9" -services: - redis: - container_name: redis-stack - image: "redis/redis-stack:latest" - ports: - - '6380:6380' - environment: - - REDIS_ARGS = "--save 10 1 --appendonly yes" - command: [ "redis-server", "/usr/local/etc/redis/redis.conf" ] - volumes: - - ./redis-data:/data - - ./redis.conf:/usr/local/etc/redis/redis.conf - networks: - - bizmatch - -networks: - bizmatch: - external: true diff --git a/redis/redis.conf b/redis/redis.conf deleted file mode 100644 index 03e41d2..0000000 --- a/redis/redis.conf +++ /dev/null @@ -1,13 +0,0 @@ -port 6380 -daemonize no -loadmodule /opt/redis-stack/lib/rediscompat.so -loadmodule /opt/redis-stack/lib/redisearch.so -loadmodule /opt/redis-stack/lib/redistimeseries.so -loadmodule /opt/redis-stack/lib/rejson.so -loadmodule /opt/redis-stack/lib/redisbloom.so -loadmodule /opt/redis-stack/lib/redisgears.so v8-plugin-path /opt/redis-stack/lib/libredisgears_v8_plugin.so - -appendonly yes -appendfsync always - -protected-mode no