diff --git a/Dockerfile.custom b/Dockerfile.custom index f2cc10e..d3a3df2 100644 --- a/Dockerfile.custom +++ b/Dockerfile.custom @@ -24,10 +24,6 @@ ARG CHROME_VERSION ARG CHROME_DRIVER_VERSION RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome $CHROME_VERSION $CHROME_DRIVER_VERSION && google-chrome --version; fi -# PhantomJS -ARG PHANTOMJS_VERSION -RUN if [ -n "$PHANTOMJS_VERSION" ] ; then /scripts/install-phantomjs $PHANTOMJS_VERSION; fi - # NodeJS and Yarn ARG NODE_INSTALL_VERSION ARG YARN_INSTALL_VERSION diff --git a/README.md b/README.md index 3b39012..9e2b415 100644 --- a/README.md +++ b/README.md @@ -37,9 +37,9 @@ The name is defined as `[feature]-[version]` pairs, separated by `-`. Here are some example build names: -1. `ruby-2.1-git-2.7-phantomjs-2.1` +1. `ruby-2.1-git-2.7` 1. `ruby-2.3.3-golang-1.8-git-2.7-chrome-60.0-node-7.1-postgresql-9.6` -1. `ruby-2.4.1-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6` +1. `ruby-2.4.1-golang-1.8-git-2.7-node-7.1-postgresql-9.6` The first pair represents the base image and version. So `ruby-2.1-...` will use the `ruby:2.1` base image, while `golang-1.8` will use the `golang:1.8` base image. @@ -52,7 +52,6 @@ options are: 1. `chrome` 1. `node` 1. `yarn` -1. `phantomjs` 1. `postgres` 1. `terraform` 1. `ansible`