From 8d7b25f96473145f8109b3c118a3b3922d2ccebc Mon Sep 17 00:00:00 2001 From: Shubho Banerjee Date: Wed, 12 Feb 2025 15:48:08 +0530 Subject: [PATCH 1/2] buildpack changes to official --- README.md | 12 ++++++------ lib/parse_yaml.js | 2 +- test/expected.js | 2 +- test/expected/build.json | 8 ++++---- test/expected/buildWithoutBuilder.json | 4 ++-- test/expected/repositoryOption.json | 8 ++++---- test/files/build.yaml | 2 +- test/files/buildWithoutBuilder.yaml | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 2647e59..8f1b4e3 100644 --- a/README.md +++ b/README.md @@ -78,12 +78,12 @@ There are three ways to configure how to containerize a module: | Keyword | Parsed to | |-------------------|--------------------------------------------------------------| - | *nodejs* | gcr.io/paketo-buildpacks/nodejs | - | *java* | gcr.io/paketo-buildpacks/java | - | *sap-machine* | gcr.io/paketo-buildpacks/sap-machine | - | *executable-jar* | gcr.io/paketo-buildpacks/executable-jar | - | *spring-boot* | gcr.io/paketo-buildpacks/spring-boot | - | *syft* | gcr.io/paketo-buildpacks/syft | + | *nodejs* | paketo-buildpacks/nodejs | + | *java* | paketo-buildpacks/java | + | *sap-machine* | paketo-buildpacks/sap-machine | + | *executable-jar* | paketo-buildpacks/executable-jar | + | *spring-boot* | paketo-buildpacks/spring-boot | + | *syft* | paketo-buildpacks/syft |
diff --git a/lib/parse_yaml.js b/lib/parse_yaml.js index fa94fbb..536f2af 100644 --- a/lib/parse_yaml.js +++ b/lib/parse_yaml.js @@ -39,7 +39,7 @@ function processBuildpack(build_parameters, name, tag) { type = type ? type.split(',').map(type => { type = type.trim() if (buildpacks.has(type)) { - return `gcr.io/paketo-buildpacks/${type}` + return `paketo-buildpacks/${type}` } else { return type } diff --git a/test/expected.js b/test/expected.js index 7b55b6b..ea358c5 100644 --- a/test/expected.js +++ b/test/expected.js @@ -12,7 +12,7 @@ const desired_output = { "app", [ "--buildpack", - "gcr.io/paketo-buildpacks/nodejs" + "paketo-buildpacks/nodejs" ], "--builder", "paketobuildpacks/builder-jammy-base", diff --git a/test/expected/build.json b/test/expected/build.json index 9543510..4c80410 100644 --- a/test/expected/build.json +++ b/test/expected/build.json @@ -12,7 +12,7 @@ "app", [ "--buildpack", - "gcr.io/paketo-buildpacks/nodejs" + "paketo-buildpacks/nodejs" ], "--builder", "paketobuildpacks/builder-jammy-base", @@ -44,11 +44,11 @@ ".", [ "--buildpack", - "gcr.io/paketo-buildpacks/sap-machine" + "paketo-buildpacks/sap-machine" ], [ "--buildpack", - "gcr.io/paketo-buildpacks/java" + "paketo-buildpacks/java" ], "--builder", "paketobuildpacks/builder-jammy-buildpackless-base", @@ -107,7 +107,7 @@ "build", "bookshop-hana-deployer", "--buildpack", - "gcr.io/paketo-buildpacks/nodejs", + "paketo-buildpacks/nodejs", "--path", "db", "--builder", diff --git a/test/expected/buildWithoutBuilder.json b/test/expected/buildWithoutBuilder.json index 98ba907..399b782 100644 --- a/test/expected/buildWithoutBuilder.json +++ b/test/expected/buildWithoutBuilder.json @@ -12,7 +12,7 @@ "app", [ "--buildpack", - "gcr.io/paketo-buildpacks/nodejs" + "paketo-buildpacks/nodejs" ], "--env", "BP_NODE_RUN_SCRIPTS=\"\"" @@ -65,7 +65,7 @@ "build", "bookshop-hana-deployer", "--buildpack", - "gcr.io/paketo-buildpacks/nodejs", + "paketo-buildpacks/nodejs", "--path", "db" ] diff --git a/test/expected/repositoryOption.json b/test/expected/repositoryOption.json index 893e838..079017e 100644 --- a/test/expected/repositoryOption.json +++ b/test/expected/repositoryOption.json @@ -12,7 +12,7 @@ "app", [ "--buildpack", - "gcr.io/paketo-buildpacks/nodejs" + "paketo-buildpacks/nodejs" ], "--builder", "paketobuildpacks/builder-jammy-base", @@ -44,11 +44,11 @@ ".", [ "--buildpack", - "gcr.io/paketo-buildpacks/sap-machine" + "paketo-buildpacks/sap-machine" ], [ "--buildpack", - "gcr.io/paketo-buildpacks/java" + "paketo-buildpacks/java" ], "--builder", "paketobuildpacks/builder-jammy-buildpackless-base", @@ -107,7 +107,7 @@ "build", "bookshop-hana-deployer", "--buildpack", - "gcr.io/paketo-buildpacks/nodejs", + "paketo-buildpacks/nodejs", "--path", "db", "--builder", diff --git a/test/files/build.yaml b/test/files/build.yaml index e6e0f4a..0cd6789 100644 --- a/test/files/build.yaml +++ b/test/files/build.yaml @@ -28,4 +28,4 @@ modules: - name: bookshop-hana-deployer build-parameters: commands: - - 'pack build bookshop-hana-deployer --buildpack gcr.io/paketo-buildpacks/nodejs --path db --builder paketobuildpacks/builder-jammy-base' \ No newline at end of file + - 'pack build bookshop-hana-deployer --buildpack paketo-buildpacks/nodejs --path db --builder paketobuildpacks/builder-jammy-base' \ No newline at end of file diff --git a/test/files/buildWithoutBuilder.yaml b/test/files/buildWithoutBuilder.yaml index 89dd47f..afb5507 100644 --- a/test/files/buildWithoutBuilder.yaml +++ b/test/files/buildWithoutBuilder.yaml @@ -17,4 +17,4 @@ modules: - name: bookshop-hana-deployer build-parameters: commands: - - 'pack build bookshop-hana-deployer --buildpack gcr.io/paketo-buildpacks/nodejs --path db' \ No newline at end of file + - 'pack build bookshop-hana-deployer --buildpack paketo-buildpacks/nodejs --path db' \ No newline at end of file From 4b3a6ae7b3c850d0f19d0fff162aab67e741a221 Mon Sep 17 00:00:00 2001 From: Shubho Banerjee Date: Wed, 12 Feb 2025 15:57:29 +0530 Subject: [PATCH 2/2] release changes --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 385829e..403a9ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. +## Version 0.2.7 - 2025-02-12 + +### Fixed + +- Reserved keywords refer to official buildpacks now + ## Version 0.2.6 - 2025-01-28 ### Fixed diff --git a/package.json b/package.json index 0872da3..f7f92ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ctz", - "version": "0.2.6", + "version": "0.2.7", "description": "Build tool to containerize cloud applications", "homepage": "https://github.com/SAP/ctz", "keywords": [