Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
21d2f73b
Unverified
Commit
21d2f73b
authored
Jul 23, 2018
by
Colby Gutierrez-Kraybill
Committed by
GitHub
Jul 23, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1975 from colbygk/docker_ergonomics
watchOptions required for use in docker environment
parents
1d282a48
5bf674a4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
1 deletion
+14
-1
.eslintignore
.eslintignore
+1
-0
dev-server/index.js
dev-server/index.js
+12
-1
docker-compose.yml
docker-compose.yml
+1
-0
No files found.
.eslintignore
View file @
21d2f73b
...
...
@@ -5,3 +5,4 @@ intl/*
locales/*
**/*.min.js
**/node_modules/*
scratch-gui/*
dev-server/index.js
View file @
21d2f73b
...
...
@@ -21,7 +21,18 @@ routes.forEach(route => {
app
.
get
(
route
.
pattern
,
handler
(
route
));
});
app
.
use
(
webpackDevMiddleware
(
compiler
));
var
middlewareOptions
=
{};
if
(
process
.
env
.
USE_DOCKER_WATCHOPTIONS
)
{
middlewareOptions
=
{
watchOptions
:
{
aggregateTimeout
:
500
,
poll
:
2500
,
ignored
:
[
'
node_modules
'
,
'
build
'
]
}
};
}
app
.
use
(
webpackDevMiddleware
(
compiler
,
middlewareOptions
));
var
proxyHost
=
process
.
env
.
FALLBACK
||
''
;
if
(
proxyHost
!==
''
)
{
...
...
docker-compose.yml
View file @
21d2f73b
...
...
@@ -15,6 +15,7 @@ services:
environment
:
-
API_HOST=http://localhost:8491
-
FALLBACK=http://localhost:8080
-
USE_DOCKER_WATCHOPTIONS=true
build
:
context
:
./
dockerfile
:
Dockerfile
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment