diff --git a/Dockerfile b/Dockerfile index 54c660e..5d47a7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM schliflo/docker-puppeteer:3.0.1 +FROM schliflo/docker-puppeteer:3.0.2 LABEL maintainer "Nemo " @@ -18,8 +18,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.schema-version="1.0.0-rc1" -COPY index.js server.js prom.js *.md init.sh /app/ +COPY index.js server.js prom.js *.md /app/ -ENTRYPOINT ["/app/init.sh"] +ENTRYPOINT ["/usr/local/bin/node", "server.js"] EXPOSE 3000 diff --git a/init.sh b/init.sh deleted file mode 100755 index 45456a7..0000000 --- a/init.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -export CHROME_REVISION=$(node -e "console.log(require('/usr/local/share/.config/yarn/global/node_modules/puppeteer/package.json')['puppeteer']['chromium_revision'])") -export CHROME_BIN="/usr/local/share/.config/yarn/global/node_modules/puppeteer/.local-chromium/linux-$CHROME_REVISION/chrome-linux/chrome" - -/usr/local/bin/node server.js $@ diff --git a/package-lock.json b/package-lock.json index ec6d524..263ccb6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,9 +10,9 @@ "integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=" }, "@types/node": { - "version": "13.13.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.2.tgz", - "integrity": "sha512-LB2R1Oyhpg8gu4SON/mfforE525+Hi/M1ineICEDftqNVTyFg1aRIeGuTvXAoWHc4nbrFncWtJgMmoyRvuGh7A==", + "version": "13.13.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.4.tgz", + "integrity": "sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA==", "optional": true }, "@types/yauzl": { @@ -268,9 +268,9 @@ } }, "puppeteer-core": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-3.0.1.tgz", - "integrity": "sha512-iVXRhZy4rtmXt+JuLroPe2DnlLqQx3XcGnudHrpuL3KNYDx3lCiPVXjo1mnVbFtYhPb7Gs0L1Wb+Z6TtXwppZg==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-3.0.2.tgz", + "integrity": "sha512-p7KASG81KnY7taJZrutZyMZrFZPYVQ0IRKNMmPviUYGhyq1mdF2VOZyw/+NqWumhBk4Swdd/yEboe/BYBx1QnA==", "requires": { "@types/mime-types": "^2.1.0", "debug": "^4.1.0", @@ -373,9 +373,9 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "ws": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz", - "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==" + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.5.tgz", + "integrity": "sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==" }, "yauzl": { "version": "2.10.0", diff --git a/package.json b/package.json index 36c54be..e98a8ae 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,6 @@ "dependencies": { "containerized": "^1.0.2", "prom-client": "^12.0.0", - "puppeteer-core": "^3.0.0" + "puppeteer-core": "^3.0.2" } }