From 63f2d694309435072083acc6115eb40eec79cb04 Mon Sep 17 00:00:00 2001 From: Jose134 Date: Wed, 22 Jan 2025 12:00:43 +0100 Subject: [PATCH] Fix deployment --- Dockerfile | 6 +++--- Jenkinsfile | 3 ++- index.html | 1 - nginx.conf | 2 +- src/main.jsx | 3 --- src/socket.js | 26 +++++++++++++------------- vite.config.js | 2 +- 7 files changed, 20 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1861d40..dd29537 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM node:20-alpine as builder WORKDIR /app COPY . . -ARG VITE_APP_BACKEND_ADDRESS -ENV VITE_APP_BACKEND_ADDRESS $VITE_APP_BACKEND_ADDRESS +ARG VITE_SOCKET_URL +ENV VITE_SOCKET_URL $VITE_SOCKET_URL RUN npm install RUN npm run build FROM nginx:1.25.4-alpine-slim as prod COPY --from=builder /app/dist /usr/share/nginx/html COPY nginx.conf /etc/nginx/conf.d -EXPOSE 3000 +EXPOSE 5173 CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index db01716..29021f3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,13 +4,14 @@ pipeline { environment { IMAGE_NAME = "darkbird/minesweeper-frontend:latest" REGISTRY_IMAGE_NAME = "registry.xdarkbird.duckdns.org/darkbird/minesweeper-frontend:latest" + VITE_SOCKET_URL = "http://darkbird.es:5174" } stages { stage('Docker build') { steps { sh """ - docker build --build-arg VITE_SOCKET_URL=http://minesweeper-backend.darkbird.es --network="host" -t ${IMAGE_NAME} . + docker build --build-arg VITE_SOCKET_URL=${VITE_SOCKET_URL} --network="host" -t ${IMAGE_NAME} . """ } } diff --git a/index.html b/index.html index 3a66ef7..d2f22a9 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,6 @@ - Minesweeper diff --git a/nginx.conf b/nginx.conf index 66f6733..a9db578 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,5 +1,5 @@ server { - listen 3000; + listen 5173; root /usr/share/nginx/html; index index.html; etag on; diff --git a/src/main.jsx b/src/main.jsx index b9a1a6d..b28b95c 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -1,10 +1,7 @@ -import { StrictMode } from 'react' import { createRoot } from 'react-dom/client' import './index.css' import App from './App.jsx' createRoot(document.getElementById('root')).render( - - , ) diff --git a/src/socket.js b/src/socket.js index 2f0bccf..69ac54c 100644 --- a/src/socket.js +++ b/src/socket.js @@ -1,56 +1,56 @@ -import { io } from 'socket.io-client'; +import { io } from "socket.io-client"; -const URL = 'http://192.168.0.134:5174'; -console.log('Backend URL', URL); +const URL = import.meta.env.VITE_SOCKET_URL || "http://192.168.0.134:5174"; +console.log("Backend URL", URL); export const socket = io(URL, { autoConnect: false, - transports: ['websocket'], + transports: ["websocket"], withCredentials: true, }); export const setupSocketEffect = (socket, setRoom) => { const socketHandlers = [ { - event: 'connect', + event: "connect", handler: () => { } }, { - event: 'disconnect', + event: "disconnect", handler: () => { setRoom(null); } }, { - event: 'error', + event: "error", handler: (error) => { - console.error(error); + console.error("Socket error", error); } }, { - event: 'youJoinedRoom', + event: "youJoinedRoom", handler: (data) => { setRoom({ ...data }); } }, { - event: 'roomUserJoined', + event: "roomUserJoined", handler: (data) => { setRoom({ ...data }); } }, { - event: 'roomUserLeft', + event: "roomUserLeft", handler: (data) => { setRoom({ ...data }); } }, { - event: 'updateRoom', + event: "updateRoom", handler: (data) => { setRoom({ ...data }); } - } + }, ]; socketHandlers.forEach(({ event, handler }) => { diff --git a/vite.config.js b/vite.config.js index c6050ce..599d6af 100644 --- a/vite.config.js +++ b/vite.config.js @@ -7,7 +7,7 @@ export default defineConfig(({ command, mode }) => { return { plugins: [react()], server: { - port: 3000, + port: 5173, host: true, watch: { usePolling: true,