diff options
| author | Jamal Carvalho <jamal@golang.org> | 2021-04-19 10:29:24 -0400 |
|---|---|---|
| committer | Jamal Carvalho <jamal@golang.org> | 2021-04-19 15:58:58 +0000 |
| commit | 45f2ff297094da4fbfcc36ab3c98ca299e641d02 (patch) | |
| tree | aa5d89ab31537b98da7a322aca24714f7f2beee4 | |
| parent | 4a59031e85ec8f2a2677bb103731c1cc7a0c106e (diff) | |
| download | go-x-pkgsite-45f2ff297094da4fbfcc36ab3c98ca299e641d02.tar.xz | |
devtools,e2e: update docker run flags
Adds the --rm flag to automatically clean up
docker containers after script runs. Removes
the -it flag for docker_nodejs as it causes
an error in CI.
Change-Id: If8cae56bc9dbe691ff216053e222b43e5591623a
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/311373
Reviewed-by: Julie Qiu <julie@golang.org>
Trust: Jamal Carvalho <jamal@golang.org>
| -rwxr-xr-x | devtools/docker_nodejs.sh | 2 | ||||
| -rw-r--r-- | e2e/global-setup.ts | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/devtools/docker_nodejs.sh b/devtools/docker_nodejs.sh index 09644630..db24a11f 100755 --- a/devtools/docker_nodejs.sh +++ b/devtools/docker_nodejs.sh @@ -8,4 +8,4 @@ set -e # Script for running a nodejs docker image. -docker run -it -v `pwd`:/pkgsite -w /pkgsite node:14.15.1 $@ +docker run --rm -v `pwd`:/pkgsite -w /pkgsite node:14.15.1 $@ diff --git a/e2e/global-setup.ts b/e2e/global-setup.ts index b6d2945b..c6b93f60 100644 --- a/e2e/global-setup.ts +++ b/e2e/global-setup.ts @@ -25,9 +25,13 @@ const port = Number(process.env.PORT) || 3000; * and sleeps momentarily to make sure everything is ready to go. */ export default async function setup(): Promise<void> { - global.chromium = spawn('docker', ['run', '-p', `${port}:${port}`, 'browserless/chrome'], { - stdio: 'ignore', - }); + global.chromium = spawn( + 'docker', + ['run', '--rm', '-p', `${port}:${port}`, 'browserless/chrome'], + { + stdio: 'ignore', + } + ); global.chromium.on('error', e => { console.error(e); @@ -35,7 +39,7 @@ export default async function setup(): Promise<void> { }); await wait({ port, output: 'dots' }); - await sleep(1000); + await sleep(3000); } function sleep(ms: number) { |