From 408e4c84d3b31085237500bc81b75923597f792c Mon Sep 17 00:00:00 2001
From: Nicolas Meienberger <github@thisprops.com>
Date: Fri, 9 Feb 2024 18:51:58 +0100
Subject: [PATCH] chore: remove docker socket proxy

---
 docker-compose.dev.yml                     | 25 +---------------------
 docker-compose.prod.yml                    | 25 +---------------------
 packages/worker/assets/traefik/traefik.yml |  2 +-
 3 files changed, 3 insertions(+), 49 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 22e70cf8..888ce398 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,26 +1,9 @@
 version: '3.7'
 
 services:
-  tipi-docker-proxy:
-    container_name: tipi-docker-proxy
-    image: zoeyvid/docker-socket-proxy
-    restart: unless-stopped
-    networks:
-      - socket_proxy
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      POST: 1
-      CONTAINERS: 1
-      ALLOW_START: 1
-      ALLOW_STOP: 1
-      IMAGES: 1
-      NETWORKS: 1
-
   tipi-reverse-proxy:
     container_name: tipi-reverse-proxy
     depends_on:
-      - tipi-docker-proxy
       - tipi-dashboard
     image: traefik:v2.11
     restart: unless-stopped
@@ -32,9 +15,9 @@ services:
     volumes:
       - ./traefik:/etc/traefik
       - ./traefik/shared:/shared
+      - /var/run/docker.sock:/var/run/docker.sock:ro
     networks:
       - tipi_main_network
-      - socket_proxy
 
   tipi-db:
     container_name: tipi-db
@@ -90,14 +73,11 @@ services:
         condition: service_healthy
       tipi-redis:
         condition: service_healthy
-      tipi-docker-proxy:
-        condition: service_started
     env_file:
       - .env
     environment:
       NODE_ENV: development
       TIPI_VERSION: 0.0.0
-      DOCKER_HOST: tcp://tipi-docker-proxy:2375
     volumes:
       # Dev mode
       - ./packages/worker/src:/app/packages/worker/src
@@ -113,7 +93,6 @@ services:
       - ./user-config:/app/user-config
     networks:
       - tipi_main_network
-      - socket_proxy
     labels:
       traefik.enable: true
       traefik.http.services.worker.loadbalancer.server.port: 3001
@@ -202,8 +181,6 @@ networks:
   tipi_main_network:
     driver: bridge
     name: runtipi_tipi_main_network
-  socket_proxy:
-    name: runtipi_socket_proxy
 
 volumes:
   pgdata:
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 4134bad7..16ab7193 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1,26 +1,9 @@
 version: '3.7'
 
 services:
-  tipi-docker-proxy:
-    container_name: tipi-docker-proxy
-    image: zoeyvid/docker-socket-proxy
-    restart: unless-stopped
-    networks:
-      - socket_proxy
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-    environment:
-      POST: 1
-      CONTAINERS: 1
-      ALLOW_START: 1
-      ALLOW_STOP: 1
-      IMAGES: 1
-      NETWORKS: 1
-
   tipi-reverse-proxy:
     container_name: tipi-reverse-proxy
     depends_on:
-      - tipi-docker-proxy
       - tipi-dashboard
     image: traefik:v2.11
     restart: unless-stopped
@@ -32,9 +15,9 @@ services:
     volumes:
       - ./traefik:/etc/traefik
       - ./traefik/shared:/shared
+      - /var/run/docker.sock:/var/run/docker.sock:ro
     networks:
       - tipi_main_network
-      - socket_proxy
 
   tipi-db:
     container_name: tipi-db
@@ -98,14 +81,11 @@ services:
         condition: service_healthy
       tipi-redis:
         condition: service_healthy
-      tipi-docker-proxy:
-        condition: service_started
     env_file:
       - .env
     environment:
       NODE_ENV: production
       TIPI_VERSION: 0.0.0
-      DOCKER_HOST: tcp://tipi-docker-proxy:2375
     volumes:
       - /proc:/host/proc
       - ./.env:/app/.env
@@ -118,7 +98,6 @@ services:
       - ${STORAGE_PATH:-.}:/storage
     networks:
       - tipi_main_network
-      - socket_proxy
     labels:
       traefik.enable: true
       traefik.http.services.worker.loadbalancer.server.port: 3001
@@ -205,8 +184,6 @@ networks:
   tipi_main_network:
     driver: bridge
     name: runtipi_tipi_main_network
-  socket_proxy:
-    name: runtipi_socket_proxy
 
 volumes:
   pgdata:
diff --git a/packages/worker/assets/traefik/traefik.yml b/packages/worker/assets/traefik/traefik.yml
index d8a06370..4be8caf2 100644
--- a/packages/worker/assets/traefik/traefik.yml
+++ b/packages/worker/assets/traefik/traefik.yml
@@ -4,7 +4,7 @@ api:
 
 providers:
   docker:
-    endpoint: 'tcp://tipi-docker-proxy:2375'
+    endpoint: 'unix:///var/run/docker.sock'
     network: socket_proxy
     watch: true
     exposedByDefault: false