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

build: update Node.js version and base Debian version #1847

Merged
merged 2 commits into from
Aug 3, 2023
Merged

build: update Node.js version and base Debian version #1847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4db89e3
build: update Node.js version and base Debian version
alexander-fenster Aug 2, 2023
b7fe9cd
test: update Python and Node versions in container test YAMLs
alexander-fenster Aug 3, 2023
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
10 changes: 6 additions & 4 deletions docker/owlbot/nodejs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# Version 0.2.0
# Version 0.3.0

# build from the root of this repo:
# docker build -t gcr.io/repo-automation-bots/owlbot-nodejs -f docker/owlbot/nodejs/Dockerfile .
FROM python:3.10.6-buster
FROM python:3.10.12-bookworm

WORKDIR /

###################### Install nodejs.
RUN curl -sL https://deb.nodesource.com/setup_15.x | bash -
RUN apt-get install -y nodejs
RUN curl https://nodejs.org/dist/v18.17.0/node-v18.17.0-linux-x64.tar.xz > /tmp/nodejs.tar.xz
RUN tar -C /usr/local --strip-components=1 -xJf /tmp/nodejs.tar.xz
RUN rm -f /tmp/nodejs.tar.xz
ENV PATH "$PATH:/usr/local/bin"

###################### Install synthtool's requirements.
COPY requirements.txt /synthtool/requirements.txt
Expand Down
4 changes: 2 additions & 2 deletions docker/owlbot/nodejs/container_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ schemaVersion: 1.0.0
commandTests:
- name: "node"
command: ["node", "--version"]
expectedOutput: ["v15.14.0"]
expectedOutput: ["v18.17.0"]
- name: "python"
command: ["python", "--version"]
expectedOutput: ["Python 3.10.6"]
expectedOutput: ["Python 3.10.12"]
12 changes: 7 additions & 5 deletions docker/owlbot/nodejs_mono_repo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# Version 0.2.0
# Version 0.3.0

# build from the root of this repo:
# docker build -t gcr.io/repo-automation-bots/owlbot-nodejs -f docker/owlbot/nodejs/Dockerfile .
FROM python:3.10.6-buster
# docker build -t gcr.io/repo-automation-bots/owlbot-nodejs-mono-repo -f docker/owlbot/nodejs_mono_repo/Dockerfile .
FROM python:3.10.12-bookworm

WORKDIR /

###################### Install nodejs.
RUN curl -sL https://deb.nodesource.com/setup_15.x | bash -
RUN apt-get install -y nodejs
RUN curl https://nodejs.org/dist/v18.17.0/node-v18.17.0-linux-x64.tar.xz > /tmp/nodejs.tar.xz
RUN tar -C /usr/local --strip-components=1 -xJf /tmp/nodejs.tar.xz
RUN rm -f /tmp/nodejs.tar.xz
ENV PATH "$PATH:/usr/local/bin"

###################### Install git.
RUN apt-get update && apt-get install -y git
Expand Down
4 changes: 2 additions & 2 deletions docker/owlbot/nodejs_mono_repo/container_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ schemaVersion: 1.0.0
commandTests:
- name: "node"
command: ["node", "--version"]
expectedOutput: ["v15.14.0"]
expectedOutput: ["v18.17.0"]
- name: "python"
command: ["python", "--version"]
expectedOutput: ["Python 3.10.6"]
expectedOutput: ["Python 3.10.12"]