improve Dockerfile and fix update reference task

ggrossetie · Jul 23, 2022 · 1ed0d7e · 1ed0d7e
1 parent 69a14cf
commit 1ed0d7e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "test:js": "mocha test/**_test.js",
     "lint": "standard lib/**.js test/**.js tasks/**js",
     "publish": "node tasks/publish.js",
-    "test:update-linux-reference": "docker build -f test/Dockerfile -t asciidoctor-web-pdf/test . && docker run --name asciidoctorwebpdftest asciidoctor-web-pdf/test:latest && docker cp asciidoctorwebpdftest:/app/test/output ./test/reference/linux/"
+    "test:update-linux-reference": "docker build -f test/Dockerfile -t asciidoctor-web-pdf/test . && docker run --name asciidoctorwebpdftest asciidoctor-web-pdf/test:latest; docker cp asciidoctorwebpdftest:/app/test/output/. ./test/reference/linux/ && docker rm asciidoctorwebpdftest"
   },
   "repository": {
     "type": "git",

diff --git a/test/Dockerfile b/test/Dockerfile
@@ -9,14 +9,14 @@ RUN apt-get update \
 USER asciidoc
 WORKDIR /app
 
+COPY --chown=asciidoc:asciidoc package.json package-lock.json ./
+RUN npm ci && npm cache clean --force
+
 COPY --chown=asciidoc:asciidoc lib ./lib
 COPY --chown=asciidoc:asciidoc bin ./bin
 COPY --chown=asciidoc:asciidoc css ./css
 COPY --chown=asciidoc:asciidoc fonts ./fonts
 COPY --chown=asciidoc:asciidoc test ./test
 
-COPY --chown=asciidoc:asciidoc package.json package-lock.json ./
-RUN npm ci
-
 ENV DEBUG=1
 CMD npm t