Skip to content

Смена URL-адреса сервера #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Justdanru wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Смена URL-адреса сервера #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
FROM node
FROM node:12

ENV NPM_CONFIG_LOGLEVEL warn
ARG app_env
ENV APP_ENV $app_env
ARG server_protocol='http'
ARG server_host='sv-backend.svtz.ru'
ARG server_port=5000
ENV REACT_APP_SERVER_PROTOCOL $server_protocol
ENV REACT_APP_SERVER_HOST $server_host
ENV REACT_APP_SERVER_PORT $server_port

RUN mkdir -p /frontend
WORKDIR /frontend
Expand Down
8 changes: 7 additions & 1 deletion src/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,14 @@ import {init} from "./lib/connector";
import {Promise} from 'bluebird';
global.Promise = Promise;

// Default server URL (mostly useful while development)
let serverUrl: string = "http://gl-backend.svtz.ru:5000/";
if ("REACT_APP_SERVER_PROTOCOL" in process.env && "REACT_APP_SERVER_HOST" in process.env && "REACT_APP_SERVER_PORT" in process.env) {
serverUrl = process.env.REACT_APP_SERVER_PROTOCOL + '://' + process.env.REACT_APP_SERVER_HOST + ':' + process.env.REACT_APP_SERVER_PORT + '/';
}

init({
hostBase: 'http://gl-backend.svtz.ru:5000/'
hostBase: serverUrl
});

ReactDOM.render(
Expand Down