From d84b02ef82a1690f4c7a2ad008b21de143ffe69e Mon Sep 17 00:00:00 2001
From: Rishi Ghan <rishi.ghan@gmail.com>
Date: Tue, 19 Oct 2021 07:36:35 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A6=20Added=20traefik?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml  | 36 ++++++++++++++++++++++++++++--------
 src/server/index.ts |  4 ++--
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index cc0896a..6a644bc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,6 +8,10 @@ services:
     image: frishi/threetwo
     container_name: threetwo-ui
     env_file: ./docker-compose.env
+    restart: unless-stopped
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.threetwo-ui.rule=Host(`threetwo.local`)"
     ports:
       - "8050:8050"
       - "3050:3050"
@@ -15,7 +19,7 @@ services:
     depends_on:
       - rabbitmq 
       - db
-      - nginx
+      - traefik
       - importapi
       - import
       - imagetransformation
@@ -126,15 +130,31 @@ services:
     networks:
       - proxy
   
-  nginx:
-    image: nginx
-    container_name: reverse-proxy
+
+  traefik:
+    image: traefik:2.3.4
+    restart: unless-stopped
+    container_name: traefik
+    hostname: traefik
+    command:
+      - "--log.level=DEBUG"
+      - "--api.insecure=true"
+      - "--providers.docker=true"
+      - "--providers.docker.watch=true"
+      - "--providers.docker.exposedbydefault=false"
+      - "--entrypoints.web.address=:80"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.traefik.rule=Host(`traefik.localhost`)"
+      - "traefik.http.routers.traefik.service=api@internal"
+    networks:
+      - proxy
     ports:
-      - "80:80"
+      - 80:80
+      - 8080:8080
+      - 443:443
     volumes:
-      - type: bind
-        source: ./proxy.conf
-        target: /etc/nginx/conf.d/default.conf
+      - /var/run/docker.sock:/var/run/docker.sock
   
   rabbitmq:
     image: 'bitnami/rabbitmq:latest'
diff --git a/src/server/index.ts b/src/server/index.ts
index 033e549..f1d0854 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -15,7 +15,7 @@ export const io = new Server(httpServer, {
   cors: {
     origin: "*",
     methods: ["GET", "POST"],
-  }
+  },
 });
 
 // configure app to use bodyParser for
@@ -26,7 +26,7 @@ app.use(bodyParser.urlencoded({ extended: true }));
 const port: number = Number(process.env.PORT) || 8050; // set our port
 // set rabbitMQ host
 
-const rabbitMQConnectionString = process.env.RABBITMQ_URI || "amqp://localhost";
+const rabbitMQConnectionString = process.env.RABBITMQ_URI || "amqp://localhost:5672";
 
 // Send index.html on root request
 app.use(express.static("dist"));