Modernize packaging to use Go-based buildpack-packager

README.md

@@ -13,8 +13,7 @@ Official buildpack documentation can be found here: [php buildpack docs](http://
 #### Option 1: Using the `package.sh` script
 1. Run `./scripts/package.sh [ --uncached | --cached ] [ --stack=STACK ]`
 
-This requires that you have `docker` installed on your local machine, as it
-will run packaging setup within a `ruby` image.
+This script automatically installs the Go-based `buildpack-packager` and builds the buildpack.
 
 #### Option 2: Manually use the `buildpack-packager`
 1. Make sure you have fetched submodules
@@ -29,16 +28,16 @@ will run packaging setup within a `ruby` image.
    git checkout v4.4.2  # or whatever version you want, see releases page for available versions
    ```
 
-1. Get latest buildpack dependencies, this will require having Ruby 3.0 or running in a Ruby 3.0 container image
+1. Install the Go-based buildpack-packager
 
    ```shell
-   BUNDLE_GEMFILE=cf.Gemfile bundle
+   go install github.com/cloudfoundry/libbuildpack/packager/buildpack-packager@latest
    ```
 
-1. Build the buildpack. Please note that the PHP buildpack still uses the older Ruby based buildpack packager. This is different than most of the other buildpacks which use a newer Golang based buildpack packager. You must use the Ruby based buildpack packager with the PHP buildpack.
+1. Build the buildpack
 
    ```shell
-   BUNDLE_GEMFILE=cf.Gemfile bundle exec buildpack-packager [ --uncached | --cached ] [ --any-stack | --stack=STACK ]
+   buildpack-packager build [ -uncached | -cached ] [ -any-stack | -stack=STACK ]
    ```
 
 1. Use in Cloud Foundry

manifest.yml

@@ -9,8 +9,6 @@ exclude_files:
 - ".bin/"
 - log/
 - tests/
-- cf.Gemfile
-- cf.Gemfile.lock
 - bin/package
 - buildpack-packager/
 - requirements.txt
@@ -20,8 +18,6 @@ default_versions:
   version: 8.1.32
 - name: httpd
   version: 2.4.63
-- name: newrelic
-  version: 10.21.0.11
 - name: nginx
   version: 1.27.5
 - name: composer

scripts/.util/tools.sh

@@ -45,6 +45,34 @@ function util::tools::ginkgo::install() {
   fi
 }
 
+function util::tools::buildpack-packager::install() {
+  local dir
+  while [[ "${#}" != 0 ]]; do
+    case "${1}" in
+      --directory)
+        dir="${2}"
+        shift 2
+        ;;
+
+      *)
+        util::print::error "unknown argument \"${1}\""
+    esac
+  done
+
+  mkdir -p "${dir}"
+  util::tools::path::export "${dir}"
+
+  if [[ ! -f "${dir}/buildpack-packager" ]]; then
+    util::print::title "Installing buildpack-packager"
+
+    pushd /tmp > /dev/null || return
+      GOBIN="${dir}" \
+        go install \
+          github.com/cloudfoundry/libbuildpack/packager/buildpack-packager@latest
+    popd > /dev/null || return
+  fi
+}
+
 function util::tools::jq::install() {
   local dir
   while [[ "${#}" != 0 ]]; do

scripts/brats.sh

@@ -18,13 +18,7 @@ function main() {
   source "${ROOTDIR}/scripts/.util/tools.sh"
 
   util::tools::ginkgo::install --directory "${ROOTDIR}/.bin"
-
-  # set up buildpack-packager
-  # apt-get install ruby
-  gem install bundler
-  export BUNDLE_GEMFILE=cf.Gemfile
-  bundle install
-
+  util::tools::buildpack-packager::install --directory "${ROOTDIR}/.bin"
 
   GINKGO_NODES=${GINKGO_NODES:-3}
   GINKGO_ATTEMPTS=${GINKGO_ATTEMPTS:-1}

scripts/integration.sh

@@ -89,7 +89,7 @@ function main() {
     )
   fi
 
-  #util::tools::buildpack-packager::install --directory "${ROOTDIR}/.bin"
+  util::tools::buildpack-packager::install --directory "${ROOTDIR}/.bin"
   util::tools::cf::install --directory "${ROOTDIR}/.bin"
 
   for row in "${matrix[@]}"; do

scripts/package.sh

@@ -7,9 +7,9 @@ set -o pipefail
 ROOTDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 readonly ROOTDIR
 
-## shellcheck source=SCRIPTDIR/.util/tools.sh
-#source "${ROOTDIR}/scripts/.util/tools.sh"
-#
+# shellcheck source=SCRIPTDIR/.util/tools.sh
+source "${ROOTDIR}/scripts/.util/tools.sh"
+
 # shellcheck source=SCRIPTDIR/.util/print.sh
 source "${ROOTDIR}/scripts/.util/print.sh"
 
@@ -92,43 +92,27 @@ function package::buildpack() {
     echo "${version}" > "${ROOTDIR}/VERSION"
   fi
 
+  mkdir -p "$(dirname "${output}")"
+
+  util::tools::buildpack-packager::install --directory "${ROOTDIR}/.bin"
+
+  echo "Building buildpack (version: ${version}, stack: ${stack}, cached: ${cached}, output: ${output})"
+
   local stack_flag
   stack_flag="--any-stack"
   if [[ "${stack}" != "any" ]]; then
     stack_flag="--stack=${stack}"
   fi
 
-  local cached_flag
-  cached_flag="--uncached"
-  if [[ "${cached}" == "true" ]]; then
-    cached_flag="--cached"
-  fi
-
-  pushd "${ROOTDIR}" &> /dev/null
-    cat <<EOF > Dockerfile
-FROM ruby:3.0
-RUN apt-get update && apt-get install -y zip
-ADD cf.Gemfile .
-ADD cf.Gemfile.lock .
-ENV BUNDLE_GEMFILE=cf.Gemfile
-RUN bundle install
-ENTRYPOINT ["bundle", "exec", "buildpack-packager"]
-EOF
-    docker build -t buildpack-packager . &> /dev/null
+  local file
+  file="$(
+    buildpack-packager build \
+      "--version=${version}" \
+      "--cached=${cached}" \
+      "${stack_flag}" \
+    | xargs -n1 | grep -e '\.zip$'
+  )"
 
-    docker run --rm -v "${ROOTDIR}":/buildpack -w /buildpack buildpack-packager "${stack_flag}" ${cached_flag} &> /dev/null
-
-  popd &> /dev/null
-
-  rm -f "${ROOTDIR}/Dockerfile"
-
-  file="$(ls "${ROOTDIR}" | grep -i 'php.*zip' )"
-  if [[ -z "${file}" ]]; then
-    util::print::error "failed to find zip file in ${ROOTDIR}"
-  fi
-
-  mkdir -p "$(dirname "${output}")"
-  echo "Moving ${file} to ${output}"
   mv "${file}" "${output}"
 }