Skip to content

Commit 1c60bcf

Browse files
committed
docker udpates
1 parent e12ad45 commit 1c60bcf

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

docs/06-settings.mdx

+3-3
Original file line numberDiff line numberDiff line change
@@ -5127,7 +5127,7 @@ Default value (empty to pick up Gwen default format: html)
51275127
web {
51285128
remote {
51295129
connectTimeout {
5130-
seconds = 30
5130+
seconds = 60
51315131
}
51325132
}
51335133
}
@@ -5145,7 +5145,7 @@ Default value (empty to pick up Gwen default format: html)
51455145
"web": {
51465146
"remote": {
51475147
"connectTimeout": {
5148-
"seconds": 30
5148+
"seconds": 60
51495149
}
51505150
}
51515151
}
@@ -5159,7 +5159,7 @@ Default value (empty to pick up Gwen default format: html)
51595159
Default value
51605160

51615161
```properties
5162-
gwen.web.remote.connectTimeout.seconds = 30
5162+
gwen.web.remote.connectTimeout.seconds = 60
51635163
```
51645164

51655165
</TabItem>

docs/13-docker.mdx

+9-15
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ RUN apk update \
108108
# Run as a non root gwen user
109109
RUN addgroup -S gwen && adduser -S gwen -G gwen -u 4936
110110
USER gwen
111-
RUN mkdir -p ~/Downloads
112-
RUN mkdir -p ~/.assets
111+
112+
RUN mkdir /tmp/assets
113113
```
114114

115115
### Docker compose file
@@ -129,8 +129,7 @@ services:
129129
node-docker:
130130
image: selenium/node-docker:4
131131
volumes:
132-
- assets:/opt/selenium/assets
133-
- downloads:/home/seluser/Downloads
132+
- $PWD/gwen/output/assets:/opt/selenium/assets
134133
- $PWD/gwen/conf/browsers/grid.toml:/opt/selenium/docker.toml
135134
- /var/run/docker.sock:/var/run/docker.sock
136135
depends_on:
@@ -173,8 +172,7 @@ services:
173172
- TZ
174173
volumes:
175174
- $PWD:/project
176-
- assets:/home/gwen/.assets
177-
- downloads:/home/gwen/Downloads
175+
- $PWD/gwen/output/assets:/tmp/assets
178176
working_dir: /project
179177
command: bash -c "yarn install && yarn gwen -b -c gwen/conf/browsers/grid.conf gwen/features"
180178

@@ -192,9 +190,6 @@ services:
192190
working_dir: /project
193191
command: bash -c "yarn install && yarn gwen -bn --parallel gwen/features"
194192

195-
volumes:
196-
assets:
197-
downloads:
198193
```
199194

200195
It will also create a `gwen/docker-compose-arm.toml` file for ARMs, with the only difference being the toml file mapping.
@@ -301,12 +296,12 @@ gwen {
301296
localFileDetector = auto # auto|true|false
302297
sessionRetries = auto # auto|true|false
303298
connectTimeout {
304-
seconds = 30
299+
seconds = 60
305300
}
306301
}
307302
}
308303
video {
309-
dir = "$<user.home>/.assets/$<gwen.web.sessionId>"
304+
dir = "${gwen.outDir}/assets/$<gwen.web.sessionId>"
310305
timeoutSecs = 10
311306
}
312307
}
@@ -365,7 +360,7 @@ docker-compose -f gwen/docker-compose.yml run gwen-dry-run
365360
Tear it all down when done
366361

367362
```shell
368-
docker-compose -f gwen/docker-compose.yml down
363+
docker-compose -f gwen/docker-compose.yml down --remove-orphans
369364
```
370365

371366
## Run Gwen against Grid in your local Docker
@@ -384,8 +379,7 @@ services:
384379
node-docker:
385380
image: selenium/node-docker:4
386381
volumes:
387-
- assets:/opt/selenium/assets
388-
- downloads:/home/seluser/Downloads
382+
- $PWD/gwen/output/assets:/opt/selenium/assets
389383
- $PWD/gwen/conf/browsers/grid.toml:/opt/selenium/docker.toml
390384
- /var/run/docker.sock:/var/run/docker.sock
391385
depends_on:
@@ -419,7 +413,7 @@ If you have VNC enabled, you can click the active browser session in the Grid co
419413
Tear it all down when done
420414

421415
```shell
422-
docker-compose -f gwen/docker-compose.yml down
416+
docker-compose -f gwen/docker-compose.yml down --remove-orphans
423417
```
424418

425419
## Video capture

0 commit comments

Comments
 (0)