From 9c6d4e2cbba1944120b3cbda8697fded3a0395cd Mon Sep 17 00:00:00 2001 From: razz1k Date: Wed, 7 May 2025 17:35:31 +0300 Subject: [PATCH 1/3] bump-node-to-v22 --- Dockerfile | 6 ++++-- README.md | 2 +- package-lock.json | 39 ++++++++++++++++++++++++++++++--------- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 95d0da3..ec04646 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,10 +8,12 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.c curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh && \ - curl -sL https://deb.nodesource.com/setup_18.x | bash - && \ + curl -sL https://deb.nodesource.com/setup_22.x | bash - && \ wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \ sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' && \ apt-get update && \ apt-get install -y google-cloud-sdk nodejs yarn google-chrome-unstable --no-install-recommends && \ apt-get autoremove && \ - rm -rf /var/lib/apt/lists/* + apt-get autoclean && \ + rm -rf /var/lib/apt/lists/* && \ + rm -rf /var/lib/cache/* diff --git a/README.md b/README.md index 6df2fb8..fcf4874 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Google Cloud capable Docker image for Ruby. ## Features - Ruby 3.4.2 -- Node.js v18 +- Node.js v22 - gcloud - Bundler - Yarn diff --git a/package-lock.json b/package-lock.json index df0108a..44f3ed6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,33 +1,54 @@ { "name": "gcp-ruby", "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 3, "requires": true, - "dependencies": { - "dockerlint": { + "packages": { + "": { + "name": "gcp-ruby", + "version": "1.0.0", + "license": "GPL-3.0", + "dependencies": { + "dockerlint": "^0.3.9" + }, + "devDependencies": {} + }, + "node_modules/dockerlint": { "version": "0.3.9", "resolved": "https://registry.npmjs.org/dockerlint/-/dockerlint-0.3.9.tgz", "integrity": "sha512-gps1IlRWx0hqhG7qZNYoF/Ae8wpnnPDGV0eYC60FdH2UscS4hZ+NFYX3Pusj/GImjLD/Pxkp/wib7CBb63yzZw==", - "requires": { + "dependencies": { "sty": "^0.6.1", "subarg": "^1.0.0" + }, + "bin": { + "dockerlint": "bin/dockerlint.js" + }, + "engines": { + "coffee-script": ">= 1.0.1", + "node": ">= 0.10.0" } }, - "minimist": { + "node_modules/minimist": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" }, - "sty": { + "node_modules/sty": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/sty/-/sty-0.6.1.tgz", - "integrity": "sha1-3j+5rlcLxgp0RyRfDewxIT6i1ag=" + "integrity": "sha1-3j+5rlcLxgp0RyRfDewxIT6i1ag=", + "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", + "engines": { + "coffee-script": "~ 1.0.1", + "node": ">= 0.4.0" + } }, - "subarg": { + "node_modules/subarg": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz", "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=", - "requires": { + "dependencies": { "minimist": "^1.1.0" } } From c944446ff37c11bf4cf14a7f5e7a5760b330310a Mon Sep 17 00:00:00 2001 From: razz1k Date: Wed, 7 May 2025 17:36:02 +0300 Subject: [PATCH 2/3] additional scripts for tests --- package.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b67c159..fc24edc 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,11 @@ }, "devDependencies": {}, "scripts": { - "test": "dockerlint Dockerfile" + "test": "dockerlint Dockerfile", + "build": "docker build -t gcp-ruby/test -f ./Dockerfile .", + "run": "docker run --rm -it --entrypoint sh gcp-ruby/test:latest", + "clean": "docker image rm gcp-ruby/test:latest", + "full-test": "npm run test && npm run build && npm run run && npm run clean" }, "repository": { "type": "git", From bea0afed40f309dd6e73c7613745e9b50b0adc39 Mon Sep 17 00:00:00 2001 From: razz1k Date: Thu, 8 May 2025 19:38:14 +0300 Subject: [PATCH 3/3] unnecessary scripts removed --- package.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package.json b/package.json index fc24edc..b67c159 100644 --- a/package.json +++ b/package.json @@ -7,11 +7,7 @@ }, "devDependencies": {}, "scripts": { - "test": "dockerlint Dockerfile", - "build": "docker build -t gcp-ruby/test -f ./Dockerfile .", - "run": "docker run --rm -it --entrypoint sh gcp-ruby/test:latest", - "clean": "docker image rm gcp-ruby/test:latest", - "full-test": "npm run test && npm run build && npm run run && npm run clean" + "test": "dockerlint Dockerfile" }, "repository": { "type": "git",