Fix deployment
All checks were successful
gitea/minesweeper-frontend/pipeline/head This commit looks good
All checks were successful
gitea/minesweeper-frontend/pipeline/head This commit looks good
This commit is contained in:
parent
9e20fe6829
commit
3c0ea2c14f
@ -1,13 +1,13 @@
|
|||||||
FROM node:20-alpine as builder
|
FROM node:20-alpine as builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY . .
|
COPY . .
|
||||||
ARG VITE_APP_BACKEND_ADDRESS
|
ARG VITE_SOCKET_URL
|
||||||
ENV VITE_APP_BACKEND_ADDRESS $VITE_APP_BACKEND_ADDRESS
|
ENV VITE_SOCKET_URL $VITE_SOCKET_URL
|
||||||
RUN npm install
|
RUN npm install
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
FROM nginx:1.25.4-alpine-slim as prod
|
FROM nginx:1.25.4-alpine-slim as prod
|
||||||
COPY --from=builder /app/dist /usr/share/nginx/html
|
COPY --from=builder /app/dist /usr/share/nginx/html
|
||||||
COPY nginx.conf /etc/nginx/conf.d
|
COPY nginx.conf /etc/nginx/conf.d
|
||||||
EXPOSE 3000
|
EXPOSE 5173
|
||||||
CMD ["nginx", "-g", "daemon off;"]
|
CMD ["nginx", "-g", "daemon off;"]
|
||||||
3
Jenkinsfile
vendored
3
Jenkinsfile
vendored
@ -4,13 +4,14 @@ pipeline {
|
|||||||
environment {
|
environment {
|
||||||
IMAGE_NAME = "darkbird/minesweeper-frontend:latest"
|
IMAGE_NAME = "darkbird/minesweeper-frontend:latest"
|
||||||
REGISTRY_IMAGE_NAME = "registry.xdarkbird.duckdns.org/darkbird/minesweeper-frontend:latest"
|
REGISTRY_IMAGE_NAME = "registry.xdarkbird.duckdns.org/darkbird/minesweeper-frontend:latest"
|
||||||
|
VITE_SOCKET_URL = "http://minesweeper-backend.darkbird.es"
|
||||||
}
|
}
|
||||||
|
|
||||||
stages {
|
stages {
|
||||||
stage('Docker build') {
|
stage('Docker build') {
|
||||||
steps {
|
steps {
|
||||||
sh """
|
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} .
|
||||||
"""
|
"""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
server {
|
server {
|
||||||
listen 3000;
|
listen 5173;
|
||||||
root /usr/share/nginx/html;
|
root /usr/share/nginx/html;
|
||||||
index index.html;
|
index index.html;
|
||||||
etag on;
|
etag on;
|
||||||
|
|||||||
@ -1,56 +1,62 @@
|
|||||||
import { io } from 'socket.io-client';
|
import { io } from "socket.io-client";
|
||||||
|
|
||||||
const URL = 'http://192.168.0.134:5174';
|
const URL = import.meta.env.VITE_SOCKET_URL || "http://minesweeper-backend.darkbird.es:5174";
|
||||||
console.log('Backend URL', URL);
|
console.log("Backend URL", URL);
|
||||||
export const socket = io(URL, {
|
export const socket = io(URL, {
|
||||||
autoConnect: false,
|
autoConnect: false,
|
||||||
transports: ['websocket'],
|
transports: ["websocket"],
|
||||||
withCredentials: true,
|
withCredentials: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
export const setupSocketEffect = (socket, setRoom) => {
|
export const setupSocketEffect = (socket, setRoom) => {
|
||||||
const socketHandlers = [
|
const socketHandlers = [
|
||||||
{
|
{
|
||||||
event: 'connect',
|
event: "connect",
|
||||||
handler: () => {
|
handler: () => {
|
||||||
|
console.log("Socket connected");
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
event: 'disconnect',
|
event: "disconnect",
|
||||||
handler: () => {
|
handler: () => {
|
||||||
|
console.log("Socket disconnected");
|
||||||
setRoom(null);
|
setRoom(null);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
event: 'error',
|
event: "error",
|
||||||
handler: (error) => {
|
handler: (error) => {
|
||||||
console.error(error);
|
console.error("Socket error", error);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
event: 'youJoinedRoom',
|
event: "youJoinedRoom",
|
||||||
handler: (data) => {
|
handler: (data) => {
|
||||||
|
console.log("Joined room", data);
|
||||||
setRoom({ ...data });
|
setRoom({ ...data });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
event: 'roomUserJoined',
|
event: "roomUserJoined",
|
||||||
handler: (data) => {
|
handler: (data) => {
|
||||||
|
console.log("User joined room", data);
|
||||||
setRoom({ ...data });
|
setRoom({ ...data });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
event: 'roomUserLeft',
|
event: "roomUserLeft",
|
||||||
handler: (data) => {
|
handler: (data) => {
|
||||||
|
console.log("User left room", data);
|
||||||
setRoom({ ...data });
|
setRoom({ ...data });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
event: 'updateRoom',
|
event: "updateRoom",
|
||||||
handler: (data) => {
|
handler: (data) => {
|
||||||
|
console.log("Room updated", data);
|
||||||
setRoom({ ...data });
|
setRoom({ ...data });
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
socketHandlers.forEach(({ event, handler }) => {
|
socketHandlers.forEach(({ event, handler }) => {
|
||||||
|
|||||||
@ -7,7 +7,7 @@ export default defineConfig(({ command, mode }) => {
|
|||||||
return {
|
return {
|
||||||
plugins: [react()],
|
plugins: [react()],
|
||||||
server: {
|
server: {
|
||||||
port: 3000,
|
port: 5173,
|
||||||
host: true,
|
host: true,
|
||||||
watch: {
|
watch: {
|
||||||
usePolling: true,
|
usePolling: true,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user