chore: force rebuild of node 18 image (#387)

* chore: update Dockerfile trivial change to rebuild images * build: stop building node < 18 * build: stop testing node < 18 build: start with higher Cloud SDK CLI use updated python
googleapis · Jun 5, 2024 · c734af0 · c734af0
1 parent 39406c0
commit c734af0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 52 deletions.
diff --git a/node/18-user/Dockerfile b/node/18-user/Dockerfile
@@ -51,8 +51,8 @@ RUN apt-get install -y make build-essential libssl-dev zlib1g-dev libbz2-dev \
 USER node
 
 # Install pyenv
-RUN git clone https://github.com/pyenv/pyenv.git ~/.pyenv
-RUN echo 'export PATH="/home/node/.pyenv/bin:$PATH"' >> ~/.profile && \
+RUN git clone https://github.com/pyenv/pyenv.git ~/.pyenv && \
+    echo 'export PATH="/home/node/.pyenv/bin:$PATH"' >> ~/.profile && \
     echo 'export PATH="/home/node/.pyenv/shims:$PATH"' >> ~/.profile && \
     echo 'eval "$(pyenv init -)"' >> ~/.profile && \
     echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.profile
@@ -71,7 +71,7 @@ RUN python3 -m pip install --require-hashes -r requirements.txt
 # Setup Cloud SDK
 WORKDIR /home/node
 ENV CLOUD_SDK_VERSION=446.0.0 \
-    CLOUDSDK_PYTHON=/usr/bin/python3 \
+    CLOUDSDK_PYTHON=/home/node/.pyenv/shims/python3 \
     PATH=/home/node/google-cloud-sdk/bin:$PATH
 RUN set -ex; \
     curl -LO https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-$CLOUD_SDK_VERSION-linux-x86_64.tar.gz; \

diff --git a/node/cloudbuild-test.yaml b/node/cloudbuild-test.yaml
@@ -15,32 +15,8 @@
 timeout: 7200s  # 2 hours
 steps:
 
-# 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 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 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: ['-']
-
 # Node 18
 - name: gcr.io/cloud-builders/docker
   args: ['build', '-t', 'gcr.io/cloud-devrel-kokoro-resources/node:18-user', '.']
   dir: 'node/18-user'
-  waitFor: ['-']
+  waitFor: ['-']
diff --git a/node/cloudbuild.yaml b/node/cloudbuild.yaml
@@ -15,30 +15,6 @@
 timeout: 7200s  # 2 hours
 steps:
 
-# 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 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 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: ['-']
-
 # Node 18
 - name: gcr.io/cloud-builders/docker
   args: ['build', '-t', 'gcr.io/cloud-devrel-kokoro-resources/node:18-user', '-t', 'gcr.io/cloud-devrel-public-resources/node:18-user', '.']