From 7cae17af4a1dd6b17e694f862cfe360dd9c02557 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 ++- nginx.conf | 2 +- src/socket.js | 2 +- 4 files changed, 7 insertions(+), 6 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..68474ff 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://minesweeper-backend.darkbird.es" } 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/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/socket.js b/src/socket.js index 2f0bccf..7cfb8b2 100644 --- a/src/socket.js +++ b/src/socket.js @@ -1,6 +1,6 @@ import { io } from 'socket.io-client'; -const URL = 'http://192.168.0.134:5174'; +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,