From 1a836c9479928496d6577ba32e24165eaa25cdea Mon Sep 17 00:00:00 2001 From: i544693 <369491420@qq.com> Date: Fri, 10 Dec 2021 01:55:30 +0800 Subject: [PATCH 1/5] test:docker locally. --- Dockerfile | 9 +++++++++ package.json | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..b07a97ce3 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,9 @@ +FROM mcr.microsoft.com/playwright:focal +WORKDIR /app +COPY . . +RUN rm package-lock.json +RUN npm install +RUN npx playwright install +RUN npm run build +ENTRYPOINT ["npm", "run"] +CMD ["test"] \ No newline at end of file diff --git a/package.json b/package.json index cc435fde7..ba513ce94 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,13 @@ "prepare": "npm run build", "pub:next": "cross-env RELEASE_TAG=next sh build/release.sh", "pub": "sh build/release.sh", - "postinstall": "opencollective-postinstall" + "postinstall": "opencollective-postinstall", + "docker:build": "docker build -f Dockerfile -t docsify-test:local .", + "docker:clean": "docker rmi docsify-test:local", + "docker:test": "docker run --rm -it --ipc=host --user pwuser docsify-test:local test", + "docker:test:e2e": "docker run --rm -it --ipc=host --user pwuser docsify-test:local test:e2e", + "docker:test:integration": "docker run --rm -it --ipc=host --user pwuser ddocsify-test:local test:integration", + "docker:test:unit": "docker run --rm -it --ipc=host --user pwuser docsify-test:local test:unit" }, "husky": { "hooks": { From 9200174666b000885da610759eb684f218ed024f Mon Sep 17 00:00:00 2001 From: i544693 <369491420@qq.com> Date: Fri, 10 Dec 2021 02:09:19 +0800 Subject: [PATCH 2/5] update: remove user. --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index ba513ce94..6a01ebcc6 100644 --- a/package.json +++ b/package.json @@ -46,10 +46,10 @@ "postinstall": "opencollective-postinstall", "docker:build": "docker build -f Dockerfile -t docsify-test:local .", "docker:clean": "docker rmi docsify-test:local", - "docker:test": "docker run --rm -it --ipc=host --user pwuser docsify-test:local test", - "docker:test:e2e": "docker run --rm -it --ipc=host --user pwuser docsify-test:local test:e2e", - "docker:test:integration": "docker run --rm -it --ipc=host --user pwuser ddocsify-test:local test:integration", - "docker:test:unit": "docker run --rm -it --ipc=host --user pwuser docsify-test:local test:unit" + "docker:test": "docker run --rm -it --ipc=host docsify-test:local test", + "docker:test:e2e": "docker run --rm -it --ipc=host docsify-test:local test:e2e", + "docker:test:integration": "docker run --rm -it --ipc=host ddocsify-test:local test:integration", + "docker:test:unit": "docker run --rm -it --ipc=host docsify-test:local test:unit" }, "husky": { "hooks": { From ba2127bcfa877ec7c82377440fbf578d3e577455 Mon Sep 17 00:00:00 2001 From: i544693 <369491420@qq.com> Date: Fri, 10 Dec 2021 02:11:12 +0800 Subject: [PATCH 3/5] update: rebuild. --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 6a01ebcc6..17abecefc 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "postinstall": "opencollective-postinstall", "docker:build": "docker build -f Dockerfile -t docsify-test:local .", "docker:clean": "docker rmi docsify-test:local", + "docker:rebuild": "npm run docker:clean && npm run docker:build", "docker:test": "docker run --rm -it --ipc=host docsify-test:local test", "docker:test:e2e": "docker run --rm -it --ipc=host docsify-test:local test:e2e", "docker:test:integration": "docker run --rm -it --ipc=host ddocsify-test:local test:integration", From a5b34c2c3fcd50e9bd59597de7e1bbff17a724b7 Mon Sep 17 00:00:00 2001 From: i544693 <369491420@qq.com> Date: Fri, 10 Dec 2021 02:12:58 +0800 Subject: [PATCH 4/5] update: integration. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 17abecefc..80173de06 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "docker:rebuild": "npm run docker:clean && npm run docker:build", "docker:test": "docker run --rm -it --ipc=host docsify-test:local test", "docker:test:e2e": "docker run --rm -it --ipc=host docsify-test:local test:e2e", - "docker:test:integration": "docker run --rm -it --ipc=host ddocsify-test:local test:integration", + "docker:test:integration": "docker run --rm -it --ipc=host docsify-test:local test:integration", "docker:test:unit": "docker run --rm -it --ipc=host docsify-test:local test:unit" }, "husky": { From c4543359187a278feaeab8829941257e0b6595c5 Mon Sep 17 00:00:00 2001 From: i544693 <369491420@qq.com> Date: Fri, 10 Dec 2021 16:41:41 +0800 Subject: [PATCH 5/5] update: commands. --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 80173de06..fcdec3c52 100644 --- a/package.json +++ b/package.json @@ -47,10 +47,10 @@ "docker:build": "docker build -f Dockerfile -t docsify-test:local .", "docker:clean": "docker rmi docsify-test:local", "docker:rebuild": "npm run docker:clean && npm run docker:build", - "docker:test": "docker run --rm -it --ipc=host docsify-test:local test", - "docker:test:e2e": "docker run --rm -it --ipc=host docsify-test:local test:e2e", - "docker:test:integration": "docker run --rm -it --ipc=host docsify-test:local test:integration", - "docker:test:unit": "docker run --rm -it --ipc=host docsify-test:local test:unit" + "docker:test": "docker run --rm -it --ipc=host --mount type=bind,source=$(pwd)/test,target=/app/test docsify-test:local test", + "docker:test:e2e": "docker run --rm -it --ipc=host --mount type=bind,source=$(pwd)/test,target=/app/test docsify-test:local test:e2e", + "docker:test:integration": "docker run --rm -it --ipc=host --mount type=bind,source=$(pwd)/test,target=/app/test docsify-test:local test:integration", + "docker:test:unit": "docker run --rm -it --ipc=host --mount type=bind,source=$(pwd)/test,target=/app/test docsify-test:local test:unit" }, "husky": { "hooks": {