Skip to content

Commit

Permalink
Merge pull request #7 from pcvg/2554-3-chrome-support-for-docker-image
Browse files Browse the repository at this point in the history
Chrome support for Docker image
  • Loading branch information
ain authored May 9, 2019
2 parents a36504d + 6139e8e commit 29c600c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
12 changes: 9 additions & 3 deletions .github/main.workflow
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,14 @@ action "Test Yarn" {
args = "run gcp-ruby bash -c 'which yarn || exit 1'"
}

action "Test Google Chrome" {
needs = ["Build"]
uses = "actions/docker/cli@master"
args = "run gcp-ruby bash -c 'which google-chrome || exit 1'"
}

action "Publish Filter" {
needs = ["Tag Filter", "Test Ruby", "Test Bundler", "Test Google Cloud SDK", "Test Cloud SQL Proxy", "Test Node.js", "Test Yarn"]
needs = ["Tag Filter", "Test Ruby", "Test Bundler", "Test Google Cloud SDK", "Test Cloud SQL Proxy", "Test Node.js", "Test Yarn", "Test Google Chrome"]
uses = "actions/bin/filter@master"
args = "branch master"
}
Expand Down Expand Up @@ -99,13 +105,13 @@ workflow "Release" {
}

action "Docker Tag Release" {
needs = ["Test Ruby", "Test Bundler", "Test Google Cloud SDK", "Test Cloud SQL Proxy", "Test Node.js", "Test Yarn"]
needs = ["Test Ruby", "Test Bundler", "Test Google Cloud SDK", "Test Cloud SQL Proxy", "Test Node.js", "Test Yarn", "Test Google Chrome"]
uses = "actions/docker/tag@master"
args = "gcp-ruby savingsutd/gcp-ruby --no-sha --no-latest"
}

action "Docker Login for Release" {
needs = ["Test Ruby", "Test Bundler", "Test Google Cloud SDK", "Test Cloud SQL Proxy", "Test Node.js", "Test Yarn"]
needs = ["Test Ruby", "Test Bundler", "Test Google Cloud SDK", "Test Cloud SQL Proxy", "Test Node.js", "Test Yarn", "Test Google Chrome"]
uses = "actions/docker/login@master"
secrets = ["DOCKER_USERNAME", "DOCKER_PASSWORD"]
}
Expand Down
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@ RUN echo "deb http://packages.cloud.google.com/apt cloud-sdk-jessie main" | tee
echo "deb http://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
curl -sL https://deb.nodesource.com/setup_11.x | bash - && \
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \
apt-get update && \
apt-get install --no-install-recommends -y google-cloud-sdk nodejs yarn && \
apt-get install -y gcc python-dev python-pip python-setuptools google-cloud-sdk nodejs yarn google-chrome-unstable --no-install-recommends && \
apt-get autoremove && \
rm -rf /var/lib/apt/lists/* && \
wget https://dl.google.com/cloudsql/cloud_sql_proxy.linux.amd64 -O ~/cloud_sql_proxy && \
pip install --no-cache-dir -U crcmod && \
wget -q https://dl.google.com/cloudsql/cloud_sql_proxy.linux.amd64 -O ~/cloud_sql_proxy && \
chmod +x ~/cloud_sql_proxy && \
mkdir /cloudsql
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Google Cloud capable Docker image for Ruby.
- Bundler
- Node.js
- Yarn
- Chrome

## Licence

Expand Down

0 comments on commit 29c600c

Please sign in to comment.