Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: force rebuild of node 18 image #387

Merged
merged 3 commits into from
Jun 5, 2024
Merged

chore: force rebuild of node 18 image #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38de397
chore: update Dockerfile
chingor13 Jun 3, 2024
9710435
build: stop building node < 18
chingor13 Jun 3, 2024
c9ad634
build: stop testing node < 18
chingor13 Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions node/18-user/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

System python was 3.7.x and gcloud CLI does not allow it anymore

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; \
Expand Down
26 changes: 1 addition & 25 deletions node/cloudbuild-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ['-']

Comment on lines -18 to -41
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These node versions are all EoL and no longer build.

# 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: ['-']
24 changes: 0 additions & 24 deletions node/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', '.']
Expand Down