diff --git a/docker-compose.yml b/docker-compose.yml index 5e3a513..e083d67 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: container_name: threetwo-ui env_file: ./docker-compose.env environment: - DOCKER_SOCKET_HOST: $HOSTNAME + DOCKER_HOST: $HOSTNAME restart: unless-stopped labels: - "traefik.enable=true" diff --git a/src/client/context/socket/socket.context.tsx b/src/client/context/socket/socket.context.tsx index 1ae2809..9c366a7 100644 --- a/src/client/context/socket/socket.context.tsx +++ b/src/client/context/socket/socket.context.tsx @@ -8,7 +8,7 @@ import { success } from "react-notification-system-redux"; const WebSocketContext = createContext(null); export const WebSocketProvider = ({ children }): ReactElement => { const dispatch = useDispatch(); - const socketHost = process.env.DOCKER_SOCKET_HOST || SOCKET_BASE_URI; + const socketHost = `${process.env.DOCKER_HOST}:8051` || SOCKET_BASE_URI; const socket: Socket = io(socketHost); socket.on("connect", () => { diff --git a/webpack.config.js b/webpack.config.js index 6e03f17..4cbe1f2 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -91,9 +91,7 @@ module.exports = (env) => { title: "express-typescript-react", }), new webpack.DefinePlugin({ - "process.env.DOCKER_SOCKET_HOST": JSON.stringify( - process.env.DOCKER_SOCKET_HOST, - ), + "process.env.DOCKER_HOST": JSON.stringify(process.env.DOCKER_HOST), }), new MiniCssExtractPlugin({ filename: "./css/[name].css",