Skip to content
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

Jump to bottom

Shepherd 1.2 Update #781

Merged
merged 2 commits into from Mar 26, 2020
Merged

Shepherd 1.2 Update #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afbcb8a
update to shepherd 1.2 with coturn server!
ikreymer Jan 29, 2020
bc9eeed
shepherd update:
ikreymer Jan 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 17 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Expand Up @@ -115,12 +115,25 @@ services:
- 8092:81

behaviors:
container_name: behaviors
image: "webrecorder/behaviors:latest"
container_name: behaviors
image: "webrecorder/behaviors:latest"

coturn:
container_name: coturn
image: oldwebtoday/coturn:1.0
ports:
- "33478:33478/tcp"
- "33478:33478/udp"

networks:
- browsers

env_file:
- ./wr.env

shepherd:
container_name: shepherd
image: oldwebtoday/shepherd:1.1.0
image: oldwebtoday/shepherd:1.2.0

env_file:
- ./wr.env
Expand All @@ -134,7 +147,7 @@ services:
- PROXY_GET_CA=http://wsgiprox/download/pem

- CONTAINER_EXPIRE_SECS=3600
- IDLE_TIMEOUT=120
- IDLE_TIMEOUT=5

- BROWSER_NET=webrecorder_browsers
- MAIN_NET=webrecorder_default
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
View file
Open in desktop
Expand Up @@ -98,7 +98,7 @@
"resolve-url-loader": "^2.3.0",
"sass-loader": "^7.1.0",
"serialize-javascript": "^1.5.0",
"shepherd-client": "github:oldweb-today/shepherd-client#master",
"shepherd-client": "github:oldweb-today/shepherd-client#1.2.0",
"strip-loader": "^0.1.2",
"style-loader": "0.23.1",
"superagent": "^4.0.0",
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/controls/RemoteBrowserUI/index.js
View file
Open in desktop
Expand Up @@ -74,6 +74,7 @@ class RemoteBrowserUI extends Component {
on_event: this.onEvent,
headers: { 'x-requested-with': 'XMLHttpRequest' },
webrtc: true,
webrtc_video: false,
webrtcHostIP: publicIP,
};
}
Expand Down
2 changes: 1 addition & 1 deletion install-browsers.sh
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
# By default, only latest versions of browsers are pulled. Uncomment other versions to include them as well.

# Remote Desktop System and Base Browser (Required for all browsers)
docker pull oldwebtoday/vnc-webrtc-audio
docker pull oldwebtoday/remote-desktop-server
docker pull oldwebtoday/base-displayaudio
docker pull oldwebtoday/base-browser

Expand Down