From cafeb39faa0d5cf60a6fa5ceba3b372dc8952de4 Mon Sep 17 00:00:00 2001
From: Thomas <gltron3000@gmail.com>
Date: Mon, 2 Nov 2020 16:59:57 +0100
Subject: [PATCH] Updated docker

---
 Dockerfile                       | 8 +++-----
 buildDocker.sh => buildAndRun.sh | 1 +
 buildJar.sh                      | 8 --------
 client/src/store/socketPlugin.js | 4 ++--
 docker-compose.yml               | 5 ++++-
 5 files changed, 10 insertions(+), 16 deletions(-)
 rename buildDocker.sh => buildAndRun.sh (61%)
 delete mode 100755 buildJar.sh

diff --git a/Dockerfile b/Dockerfile
index 3b2f119..5c7a966 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,10 +10,8 @@ WORKDIR /root/
 COPY --from=ui-build /usr/src/app/client/dist ./server/dist
 COPY server/package*.json ./server/
 RUN cd server && npm install
-COPY server/src ./server/
-
-EXPOSE 3000
-
-CMD ["npm", "start"]
+COPY server/src ./server/src
 
+EXPOSE 8080
 
+CMD ["node", "./server/src/server.js"]
diff --git a/buildDocker.sh b/buildAndRun.sh
similarity index 61%
rename from buildDocker.sh
rename to buildAndRun.sh
index 78721ae..3560347 100755
--- a/buildDocker.sh
+++ b/buildAndRun.sh
@@ -1 +1,2 @@
 docker build . -t gltron/tronio
+docker-compose up -d
\ No newline at end of file
diff --git a/buildJar.sh b/buildJar.sh
deleted file mode 100755
index 297052b..0000000
--- a/buildJar.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-cd client
-npm run build
-cp -r dist/* ../server/src/main/resources/public
-cd ../server
-mvn package
-cp target/tronio-0.0.1-SNAPSHOT.jar ../tronio.jar
-rm -rf ../client/dist
-rm -rf src/main/resources/public/*
diff --git a/client/src/store/socketPlugin.js b/client/src/store/socketPlugin.js
index de44532..9d0916d 100644
--- a/client/src/store/socketPlugin.js
+++ b/client/src/store/socketPlugin.js
@@ -1,7 +1,7 @@
 import { ToastProgrammatic as Toast } from 'buefy'
 
-const connection = new WebSocket('ws://localhost:3000/socket')
-// const connection = new WebSocket('wss://tronio.gltronic.ovh/socket')
+// const connection = new WebSocket('ws://localhost:3000/socket')
+const connection = new WebSocket('wss://tronio.gltronic.ovh/socket')
 
 export default function createSocketPlugin () {
   return store => {
diff --git a/docker-compose.yml b/docker-compose.yml
index d256194..951e91c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,5 +4,8 @@ services:
     image: gltron/tronio
     container_name: tronio
     ports:
-      - 8006:8181
+      - 8006:8080
+    environment:
+      - NODE_ENV=production
+      - PORT=8080
     restart: unless-stopped