NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 10:02:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'leipert-remove-phantom' into 'master'

Browse source 
Remove references to deleted phantom script

See merge request gitlab-org/gitlab-build-images!119
This commit is contained in:
Marin Jankovski 2018-10-04 11:22:12 +00:00
commit 9fa4aa85c2
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile.custom
View file

@ -24,10 +24,6 @@ ARG CHROME_VERSION
ARG CHROME_DRIVER_VERSION ARG CHROME_DRIVER_VERSION
RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome $CHROME_VERSION $CHROME_DRIVER_VERSION && google-chrome --version; fi 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 # NodeJS and Yarn
ARG NODE_INSTALL_VERSION ARG NODE_INSTALL_VERSION
ARG YARN_INSTALL_VERSION ARG YARN_INSTALL_VERSION

5
README.md
View file

@ -37,9 +37,9 @@ The name is defined as `[feature]-[version]` pairs, separated by `-`.
Here are some example build names: 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.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 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. `golang-1.8` will use the `golang:1.8` base image.
@ -52,7 +52,6 @@ options are:
1. `chrome` 1. `chrome`
1. `node` 1. `node`
1. `yarn` 1. `yarn`
1. `phantomjs`
1. `postgres` 1. `postgres`
1. `terraform` 1. `terraform`
1. `ansible` 1. `ansible`