Revert "Merge branch '2.3.x' into 2.4.x"

This reverts commit 586ce00e06, reversing
changes made to 563b8a8cec.

See gh-25839
This commit is contained in:
Andy Wilkinson
2021-04-07 10:19:20 +01:00
parent 8048e59fa9
commit e9ce20dbf4
26 changed files with 148 additions and 278 deletions

View File

@@ -1,15 +0,0 @@
= Spring Boot Test Builder
This directory contains a Cloud Native Buildpacks https://buildpacks.io/docs/concepts/components/builder/[builder] and https://buildpacks.io/docs/concepts/components/buildpack/[buildpack] that is used by integration tests to verify the behavior of the Spring Boot build plugins.
== Creating the builder
* Install the https://buildpacks.io/docs/install-pack/[pack CLI]
* Authenticate to Docker Hub via `docker login` using the `springci` repository credentials
* Use `pack` to create the builder image and publish it to Docker Hub:
[source,bash]
----
$ cd builder
$ pack builder create springci/spring-boot-cnb-builder:0.0.1 --config builder.toml --publish
----

View File

@@ -1,18 +0,0 @@
# Buildpacks to include in builder
[[buildpacks]]
id = "spring-boot/test-info"
version = "0.0.1"
uri = "../buildpacks/test-info"
# Order used for detection
[[order]]
[[order.group]]
id = "spring-boot/test-info"
version = "0.0.1"
# Stack that will be used by the builder
[stack]
id = "io.paketo.stacks.tiny"
build-image = "index.docker.io/paketobuildpacks/build:1.2.2-tiny-cnb"
run-image = "index.docker.io/paketobuildpacks/run:tiny-cnb"
run-image-mirrors = ["gcr.io/paketo-buildpacks/run:tiny-cnb"]

View File

@@ -1,30 +0,0 @@
#!/usr/bin/env bash
set -eo pipefail
echo "---> Test Info buildpack building"
# INPUT ARGUMENTS
platform_dir=$2
env_dir=${platform_dir}/env
bindings_dir=${platform_dir}/bindings
if [[ -f ${env_dir}/FORCE_FAILURE ]]; then
echo "Forced builder failure"
exit 1
fi
if compgen -G "${env_dir}/*" > /dev/null; then
for var in ${env_dir}/*; do
echo "env: $(basename ${var})=$(<${var})"
done
fi
if compgen -G "${bindings_dir}/*" > /dev/null; then
for binding in ${bindings_dir}/*; do
for f in ${binding}/*; do
echo "binding: $(basename ${binding})/$(basename ${f})=$(<${f})"
done
done
fi
echo "---> Test Info buildpack done"

View File

@@ -1,28 +0,0 @@
#!/usr/bin/env bash
set -eo pipefail
# 1. CHECK IF APPLICABLE
if [[ ! -f META-INF/MANIFEST.MF ]]; then
exit 100
fi
# 2. GET ARGS
plan_path=$2
# 3. DECLARE DEPENDENCIES (OPTIONAL)
cat >> "${plan_path}" <<EOL
# Buildpack provides this dependency
#
# NOTE: The dependency is provided during the 'build' process.
#
[[provides]]
name = "test-info"
# Buildpack requires this dependency
#
# NOTE: Everything aside from 'name' is simply additional information that the providing buildpack can use to resolve
# the dependency.
#
[[requires]]
name = "test-info"
EOL

View File

@@ -1,13 +0,0 @@
# Buildpack API version
api = "0.2"
# Buildpack ID and metadata
[buildpack]
id = "spring-boot/test-info"
version = "0.0.1"
name = "Spring Boot Test Info Buildpack"
homepage = "https://github.com/spring-projects/spring-boot"
# Stacks that the buildpack will work with
[[stacks]]
id = "io.paketo.stacks.tiny"