Removed build from docker-compose, and fixed localhost bug
This commit is contained in:
+2
-2
@@ -1,7 +1,7 @@
|
||||
version: '3'
|
||||
services:
|
||||
frontend:
|
||||
build: ./frontend
|
||||
#build: ./frontend
|
||||
image: frikky/shuffle:frontend
|
||||
container_name: shuffle-frontend
|
||||
hostname: shuffle-frontend
|
||||
@@ -26,7 +26,7 @@ services:
|
||||
volumes:
|
||||
- /etc/shuffle:/etc/shuffle
|
||||
backend:
|
||||
build: ./backend
|
||||
#build: ./backend
|
||||
image: frikky/shuffle:backend
|
||||
container_name: shuffle-backend
|
||||
hostname: ${BACKEND_HOSTNAME}
|
||||
|
||||
@@ -4582,7 +4582,6 @@ const AngularWorkflow = (props) => {
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
e
|
||||
{executionModal}
|
||||
<RightSideBar />
|
||||
<BottomCytoscapeBar />
|
||||
|
||||
+6
-4
@@ -37,11 +37,13 @@ import { createMuiTheme } from '@material-ui/core/styles';
|
||||
import AlertTemplate from "react-alert-template-basic";
|
||||
import { positions, Provider } from "react-alert";
|
||||
|
||||
// Testing - localhost
|
||||
//const globalUrl = "http://192.168.3.6:5001"
|
||||
|
||||
// Production - backend proxy forwarding in nginx
|
||||
const globalUrl = window.location.origin
|
||||
var globalUrl = window.location.origin
|
||||
if (window.location.protocol == "http:" && window.location.port === "3000") {
|
||||
globalUrl = "http://192.168.3.6:5001"
|
||||
}
|
||||
console.log(window.location)
|
||||
console.log(globalUrl)
|
||||
|
||||
const surfaceColor = "#27292D"
|
||||
const inputColor = "#383B40"
|
||||
|
||||
Reference in New Issue
Block a user