Skip to content

Commit 83c7b60

Browse files
authored
Update Developer-Guide--Set-Up-With-Docker.md to include deps installation instructions and remove outdated success message (#236)
1 parent 7e2834c commit 83c7b60

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

Developer-Guide--Set-Up-With-Docker.md

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,17 +175,23 @@ If you need to rebuild the MarkUs docker image:
175175
1. Clone the [markus-autotesting repo](https://github.com/MarkUsProject/markus-autotesting). Don't clone it into your `Markus` folder; we recommend cloning it into the same parent folder as your `Markus` folder.
176176
2. `cd` into the `markus-autotesting` folder.
177177
3. Run `docker compose build` to build a new Docker images for the MarkUs autotester.
178-
4. Run `docker compose up` to create the new containers. The first time you run this it will take a long time because it'll install all of the MarkUs autotester's dependencies.
179-
You'll know it's done when you see "INFO success..."
180-
5. Stop the containers by pressing Ctrl + C (Windows/Linux) or Cmd + C (macOS). Then, restart the containers by running the command `docker compose start`.
181-
6. In a separate terminal, start the MarkUs server: `docker compose up rails`.
182-
7. In a web browser, visit the running server, but using a different domain than `localhost`:
178+
4. Run the following commands to install the autotester's dependencies.
179+
180+
```bash
181+
docker compose run --rm server-deps-updater
182+
docker compose run --rm client-deps-updater
183+
```
184+
185+
5. Run `docker compose up` to create the new containers.
186+
6. Stop the containers by pressing Ctrl + C (Windows/Linux) or Cmd + C (macOS). Then, restart the containers by running the command `docker compose start`.
187+
7. In a separate terminal, start the MarkUs server: `docker compose up rails`.
188+
8. In a web browser, visit the running server, but using a different domain than `localhost`:
183189
- For Windows and macOS, visit `host.docker.internal:3000/csc108`. If that doesn't work:
184190
- Windows: first open a WSL terminal and enter the command `ip addr show eth0 | grep inet`. Use the IP address found after `inet`, which is a sequence of 4 numbers separated by `.`, e.g. `100.20.200.2`. Try visiting `<IP address>:3000/csc108` instead.
185191
- For macOS, visit `docker.for.mac.localhost:3000/csc108` instead.
186192
- For Linux, visit `172.17.0.1:3000/csc108`.
187-
8. Now, open a shell in the MarkUs docker container: `docker compose run --rm rails bash`.
188-
9. Execute the following commands in the MarkUs container.
193+
9. Now, open a shell in the MarkUs docker container: `docker compose run --rm rails bash`.
194+
10. Execute the following commands in the MarkUs container.
189195
1. Create sample autotesting assignments: `rails db:autotest`.
190196
2. (*The MarkUs server and autotest containers be running when you run these commands.*) Run tests for every sample autotesting asignment: `MARKUS_URL=<URL> rails db:autotest_run`, where `<URL>` is in the form `http://<DOMAIN>:3000`, and `<DOMAIN>` is the domain you used in Step 7 (e.g., `host.docker.internal`).
191197

0 commit comments

Comments
 (0)