Remove remaining references to Docker

This commit is contained in:
Ray Schamp 2019-07-15 10:54:02 -04:00
parent 065b808815
commit cccb908221
4 changed files with 0 additions and 47 deletions

View file

@ -138,35 +138,3 @@ Additionally, if you set `FALLBACK=https://scratch.mit.edu`, be aware that click
#### Windows #### Windows
Some users have experienced difficulties when trying to get our web client to work on Windows. One solution could be to use [Cygwin](https://www.cygwin.com/). If that doesn't work, you might want to use [Wubi](https://wiki.ubuntu.com/WubiGuide) (Windows XP, Vista, 7) or [Wubiuefi](https://github.com/hakuna-m/wubiuefi) (Windows 8 or higher). Wubi(uefi) is a Windows Installer for Ubuntu that allows you to have Ubuntu and Windows on one disk, without the need of an extra partition. Some users have experienced difficulties when trying to get our web client to work on Windows. One solution could be to use [Cygwin](https://www.cygwin.com/). If that doesn't work, you might want to use [Wubi](https://wiki.ubuntu.com/WubiGuide) (Windows XP, Vista, 7) or [Wubiuefi](https://github.com/hakuna-m/wubiuefi) (Windows 8 or higher). Wubi(uefi) is a Windows Installer for Ubuntu that allows you to have Ubuntu and Windows on one disk, without the need of an extra partition.
#### Docker
_This section is only relevant to the Scratch Team since it requires access to private repositories, so is not usable by 3rd party contributors._
A set of [Docker](https://www.docker.com/what-docker) related files are provided to create isolated [container](https://www.docker.com/what-container) environments suitable for end-to-end local development:
* Dockerfile
* docker-compose.yml
* docker_entrypoint.sh
##### Docker Quick Start (CLI)
Make sure you already have the Scratch REST API running locally in its docker environment.
```
$ docker-compose up
```
After this has launched you will be able to access a running copy of `scratch-www` on port 8333 via `http://localhost:8333`
##### Docker Configuration
`Dockerfile` defines how a `scratch-www` docker image is created.
`docker-compose.yml` takes care of launching `scratch-www` into a development environment that is composed of other components, such as the Scratch REST API server and the legacy Scratch code. If you have not already setup the Scratch REST API in your local environment, you will need to modify `docker-compose.yml` by removing `external: true` from:
```yaml
networks:
scratchapi_scratch_network:
external: true
```

View file

@ -22,15 +22,6 @@ routes.forEach(route => {
}); });
var middlewareOptions = {}; var middlewareOptions = {};
if (process.env.USE_DOCKER_WATCHOPTIONS) {
middlewareOptions = {
watchOptions: {
aggregateTimeout: 500,
poll: 2500,
ignored: ['node_modules', 'build']
}
};
}
app.use(webpackDevMiddleware(compiler, middlewareOptions)); app.use(webpackDevMiddleware(compiler, middlewareOptions));

5
package-lock.json generated
View file

@ -11958,11 +11958,6 @@
"ajv-keywords": "^3.1.0" "ajv-keywords": "^3.1.0"
} }
}, },
"scratch-docker": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/scratch-docker/-/scratch-docker-1.0.3.tgz",
"integrity": "sha512-AZej6X6pgnRtT/uPZeQYQWJS+drfm4XxzsDe8Ienf6cqg9JKgjCwRD00KY347xXsSJ0CmNLpwbiovC7NyLZtIw=="
},
"scratch-gui": { "scratch-gui": {
"version": "0.1.0-prerelease.20190711011201", "version": "0.1.0-prerelease.20190711011201",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20190711011201.tgz", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20190711011201.tgz",

View file

@ -44,7 +44,6 @@
"lodash.defaults": "4.0.1", "lodash.defaults": "4.0.1",
"newrelic": "1.25.4", "newrelic": "1.25.4",
"react-helmet": "5.2.0", "react-helmet": "5.2.0",
"scratch-docker": "^1.0.2",
"scratch-parser": "^5.0.0", "scratch-parser": "^5.0.0",
"scratch-storage": "^0.5.1" "scratch-storage": "^0.5.1"
}, },