Update github-config to d757969

paketo-buildpacks · Jul 29, 2020 · c9c6db9 · c9c6db9
1 parent 75f6547
commit c9c6db9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/scripts/.util/tools.sh b/scripts/.util/tools.sh
@@ -50,7 +50,7 @@ function util::tools::jam::install () {
 
   if [[ ! -f "${dir}/jam" ]]; then
     local version
-    version="v0.0.14"
+    version="v0.2.4"
 
     util::print::title "Installing jam ${version}"
     curl "https://github.com/paketo-buildpacks/packit/releases/download/${version}/jam-${os}" \
@@ -95,7 +95,7 @@ function util::tools::pack::install() {
 
   if [[ ! -f "${dir}/pack" ]]; then
     local version
-    version="v0.10.0"
+    version="v0.12.0"
 
     util::print::title "Installing pack ${version}"
     curl "https://github.com/buildpacks/pack/releases/download/${version}/pack-${version}-${os}.tgz" \

diff --git a/scripts/integration.sh b/scripts/integration.sh
@@ -40,21 +40,29 @@ function tools::install() {
 }
 
 function images::pull() {
-    util::print::title "Pulling build image..."
-    docker pull "${CNB_BUILD_IMAGE:=gcr.io/paketo-buildpacks/build:full-cnb-cf}"
+    util::print::title "Pulling builder image..."
+    docker pull "${CNB_BUILDER_IMAGE:=index.docker.io/paketobuildpacks/builder:base}"
 
-    util::print::title "Pulling run image..."
-    docker pull "${CNB_RUN_IMAGE:=gcr.io/paketo-buildpacks/run:full-cnb-cf}"
+    util::print::title "Setting default pack builder image..."
+    pack set-default-builder "${CNB_BUILDER_IMAGE}"
 
-    util::print::title "Pulling cflinuxfs3 builder image..."
-    docker pull "${CNB_BUILDER_IMAGE:=gcr.io/paketo-buildpacks/builder:cflinuxfs3}"
+    local run_image lifecycle_image
+    run_image="$(
+      docker inspect "${CNB_BUILDER_IMAGE}" \
+        | jq -r '.[0].Config.Labels."io.buildpacks.builder.metadata"' \
+        | jq -r '.stack.runImage.image'
+    )"
+    lifecycle_image="index.docker.io/buildpacksio/lifecycle:$(
+      docker inspect "${CNB_BUILDER_IMAGE}" \
+        | jq -r '.[0].Config.Labels."io.buildpacks.builder.metadata"' \
+        | jq -r '.lifecycle.version'
+    )"
 
-    export CNB_BUILD_IMAGE
-    export CNB_RUN_IMAGE
-    export CNB_BUILDER_IMAGE
+    util::print::title "Pulling run image..."
+    docker pull "${run_image}"
 
-    util::print::title "Setting default pack builder image..."
-    pack set-default-builder "${CNB_BUILDER_IMAGE}"
+    util::print::title "Pulling lifecycle image..."
+    docker pull "${lifecycle_image}"
 }
 
 function token::fetch() {

diff --git a/scripts/package.sh b/scripts/package.sh
@@ -85,7 +85,7 @@ function buildpackage::create() {
 
   pack \
     package-buildpack "${BUILD_DIR}/buildpackage.cnb" \
-      --package-config "${ROOT_DIR}/package.toml" \
+      --config "${ROOT_DIR}/package.toml" \
       --format file
 }