Skip to content

Commit

Permalink
feat: add Puppeteer 16 image (#287)
Browse files Browse the repository at this point in the history
* feat: update Node images to Python 3.8 and add puppeteer 16

* remove unsupported node 10 & 12 images from build

* adding back node 10 & 12

* revert changes to 10 & 12 images

* removed 10

* 12: change to full image

* test autoclean

* update base image

* update base image

* revert changes to other images

* skipping 16 test

* exclude other images

* remove 12 and 14 puppeteer images

* update python path

* add missing final newlines

* add newlines

* uncomment other builds

---------

Co-authored-by: Patti Shin <pattishin@users.noreply.github.com>
  • Loading branch information
kweinmeister and pattishin authored Jul 13, 2023
1 parent 2a7715d commit 6248e6d
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 68 deletions.
29 changes: 0 additions & 29 deletions node/12-puppeteer/Dockerfile

This file was deleted.

6 changes: 3 additions & 3 deletions node/14-puppeteer/Dockerfile → node/16-puppeteer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14
FROM node:16

# Taken from
# https://github.com/GoogleChrome/puppeteer/blob/main/docs/troubleshooting.md#running-puppeteer-in-docker
Expand Down Expand Up @@ -42,8 +42,8 @@ RUN echo 'export PATH="/home/node/.pyenv/bin:$PATH"' >> ~/.profile && \
ENV PATH="/home/node/.pyenv/bin:/home/node/.pyenv/shims:${PATH}"

# Install python
RUN pyenv install 3.7.4 && \
pyenv global 3.7.4 && \
RUN pyenv install 3.8.16 && \
pyenv global 3.8.16 && \
python3 -m pip install --upgrade pip setuptools

# Setup Cloud SDK
Expand Down
24 changes: 6 additions & 18 deletions node/cloudbuild-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,38 +15,26 @@
timeout: 7200s # 2 hours
steps:

# Node 10
- name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/cloud-devrel-kokoro-resources/node:10-user', '.']
dir: 'node/10-user'
waitFor: ['-']

# Node 12
- name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/cloud-devrel-kokoro-resources/node:12-user', '.']
dir: 'node/12-user'
waitFor: ['-']

# Node 12-puppeteer
- name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/cloud-devrel-kokoro-resources/node:12-puppeteer', '.']
dir: 'node/12-puppeteer'
waitFor: ['-']

# Node 14
- name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/cloud-devrel-kokoro-resources/node:14-user', '.']
dir: 'node/14-user'
waitFor: ['-']

# Node 14-puppeteer
- name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/cloud-devrel-kokoro-resources/node:14-puppeteer', '.']
dir: 'node/14-puppeteer'
waitFor: ['-']

# Node 16
- name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/cloud-devrel-kokoro-resources/node:16-user', '.']
dir: 'node/16-user'
waitFor: ['-']

# Node 16-puppeteer
- name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/cloud-devrel-kokoro-resources/node:16-puppeteer', '.']
dir: 'node/16-puppeteer'
waitFor: ['-']
24 changes: 6 additions & 18 deletions node/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,42 +15,30 @@
timeout: 7200s # 2 hours
steps:

# Node 10
- name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/cloud-devrel-kokoro-resources/node:10-user', '-t', 'gcr.io/cloud-devrel-public-resources/node:10-user', '.']
dir: 'node/10-user'
waitFor: ['-']

# Node 12
- name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/cloud-devrel-kokoro-resources/node:12-user', '-t', 'gcr.io/cloud-devrel-public-resources/node:12-user', '.']
dir: 'node/12-user'
waitFor: ['-']

# Node 12-puppeteer
- name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/cloud-devrel-kokoro-resources/node:12-puppeteer', '-t', 'gcr.io/cloud-devrel-public-resources/node:12-puppeteer', '.']
dir: 'node/12-puppeteer'
waitFor: ['-']

# Node 14
- name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/cloud-devrel-kokoro-resources/node:14-user', '-t', 'gcr.io/cloud-devrel-public-resources/node:14-user', '.']
dir: 'node/14-user'
waitFor: ['-']

# Node 14-puppeteer
- name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/cloud-devrel-kokoro-resources/node:14-puppeteer', '-t', 'gcr.io/cloud-devrel-public-resources/node:14-puppeteer', '.']
dir: 'node/14-puppeteer'
waitFor: ['-']

# Node 16
- name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/cloud-devrel-kokoro-resources/node:16-user', '-t', 'gcr.io/cloud-devrel-public-resources/node:16-user', '.']
dir: 'node/16-user'
waitFor: ['-']

# Node 16-puppeteer
- name: gcr.io/cloud-builders/docker
args: ['build', '-t', 'gcr.io/cloud-devrel-kokoro-resources/node:16-puppeteer', '-t', 'gcr.io/cloud-devrel-public-resources/node:16-puppeteer', '.']
dir: 'node/16-puppeteer'
waitFor: ['-']

images:
- gcr.io/cloud-devrel-kokoro-resources/node
- gcr.io/cloud-devrel-public-resources/node

0 comments on commit 6248e6d

Please sign in to comment.