Skip to content

Commit

Permalink
build: update Node.js version and base Debian version (#1847)
Browse files Browse the repository at this point in the history
* build: update Node.js version and base Debian version

* test: update Python and Node versions in container test YAMLs
  • Loading branch information
alexander-fenster committed Aug 3, 2023
1 parent 352b9d4 commit f54a720
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 13 deletions.
10 changes: 6 additions & 4 deletions docker/owlbot/nodejs/Dockerfile
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
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
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
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"]

0 comments on commit f54a720

Please sign in to comment.