aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorpaulrbr-fl <43074087+paulrbr-fl@users.noreply.github.com>2019-03-13 14:25:11 +0100
committerGitHub <noreply@github.com>2019-03-13 14:25:11 +0100
commit65074988fb4e2ddced8edba50927f6f6536604c3 (patch)
treed0e16ea15a01718f8c8e15c8e38acf52f61997d6
parentf5311052e52ca898602cdae2c61ae1891768283c (diff)
parent79b430f2e322f2607d3139a31c35e64c3b22cb08 (diff)
downloaddocker-puppeteer-65074988fb4e2ddced8edba50927f6f6536604c3.tar.gz
docker-puppeteer-65074988fb4e2ddced8edba50927f6f6536604c3.tar.zst
docker-puppeteer-65074988fb4e2ddced8edba50927f6f6536604c3.zip
Merge pull request #1 from paulrbr-fl/master
Upgrade latest upstream changes
-rw-r--r--Dockerfile4
-rw-r--r--README.md6
-rw-r--r--package-lock.json18
-rw-r--r--package.json2
4 files changed, 18 insertions, 12 deletions
diff --git a/Dockerfile b/Dockerfile
index af1e706..6d4567b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@
3# Based upon: 3# Based upon:
4# https://github.com/GoogleChrome/puppeteer/blob/master/docs/troubleshooting.md#running-puppeteer-in-docker 4# https://github.com/GoogleChrome/puppeteer/blob/master/docs/troubleshooting.md#running-puppeteer-in-docker
5 5
6FROM node:10.15.1-slim@sha256:f584009b47eb352e7ae0a550fb9394533dc9b80f7aa83d50ef81657358412d0e 6FROM node:10.15.3-slim@sha256:5a48598688f771a9140fdef31585dbe67b313b1e29439cbd9b81ebb25aeca517
7 7
8RUN apt-get update \ 8RUN apt-get update \
9 # See https://crbug.com/795759 9 # See https://crbug.com/795759
10 && apt-get install -yq libgconf-2-4 \ 10 && apt-get install -yq libgconf-2-4 \
diff --git a/README.md b/README.md
index 8322299..ea05d30 100644
--- a/README.md
+++ b/README.md
@@ -13,3 +13,9 @@ See the [example directory](example) for a complete Docker Compose example, show
13## Dependent Services 13## Dependent Services
14 14
15This image includes [wait-for-it.sh](https://github.com/vishnubob/wait-for-it) which can be useful if you need to wait for a dependent web service to start accepting requests before your Puppeteer container attempts connecting to it. See [the example](example) for usage. 15This image includes [wait-for-it.sh](https://github.com/vishnubob/wait-for-it) which can be useful if you need to wait for a dependent web service to start accepting requests before your Puppeteer container attempts connecting to it. See [the example](example) for usage.
16
17## Releasing
18
191. Create a new release on GitHub. The image is tagged with the same version as Puppeteer.
202. Docker Hub automatically builds images for the tag.
213. There is no step 3.
diff --git a/package-lock.json b/package-lock.json
index b67d55e..f79d96c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -64,9 +64,9 @@
64 } 64 }
65 }, 65 },
66 "es6-promise": { 66 "es6-promise": {
67 "version": "4.2.5", 67 "version": "4.2.6",
68 "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz", 68 "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
69 "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==" 69 "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q=="
70 }, 70 },
71 "es6-promisify": { 71 "es6-promisify": {
72 "version": "5.0.0", 72 "version": "5.0.0",
@@ -231,9 +231,9 @@
231 "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=" 231 "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4="
232 }, 232 },
233 "puppeteer": { 233 "puppeteer": {
234 "version": "1.12.2", 234 "version": "1.13.0",
235 "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.12.2.tgz", 235 "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.13.0.tgz",
236 "integrity": "sha512-xWSyCeD6EazGlfnQweMpM+Hs6X6PhUYhNTHKFj/axNZDq4OmrVERf70isBf7HsnFgB3zOC1+23/8+wCAZYg+Pg==", 236 "integrity": "sha512-LUXgvhjfB/P6IOUDAKxOcbCz9ISwBLL9UpKghYrcBDwrOGx1m60y0iN2M64mdAUbT4+7oZM5DTxOW7equa2fxQ==",
237 "requires": { 237 "requires": {
238 "debug": "^4.1.0", 238 "debug": "^4.1.0",
239 "extract-zip": "^1.6.6", 239 "extract-zip": "^1.6.6",
@@ -296,9 +296,9 @@
296 "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" 296 "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
297 }, 297 },
298 "ws": { 298 "ws": {
299 "version": "6.1.3", 299 "version": "6.1.4",
300 "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.3.tgz", 300 "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz",
301 "integrity": "sha512-tbSxiT+qJI223AP4iLfQbkbxkwdFcneYinM2+x46Gx2wgvbaOMO36czfdfVUBRTHvzAMRhDd98sA5d/BuWbQdg==", 301 "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==",
302 "requires": { 302 "requires": {
303 "async-limiter": "~1.0.0" 303 "async-limiter": "~1.0.0"
304 } 304 }
diff --git a/package.json b/package.json
index bfe11d7..f30211a 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
1{ 1{
2 "dependencies": { 2 "dependencies": {
3 "puppeteer": "1.12.2" 3 "puppeteer": "1.13.0"
4 } 4 }
5} 5}