Merge branch 'main' into AidanDelaney-patch-2

Makefile

@@ -18,10 +18,12 @@ build-jammy: build-base-jammy build-builder-jammy build-buildpacks-jammy
 
 build-base-alpine:
 	@echo "> Building 'alpine' base images..."
+	${PACK_CMD} config experimental true
 	bash base-images/build.sh alpine
 
 build-base-jammy:
 	@echo "> Building 'jammy' base images..."
+	${PACK_CMD} config experimental true
 	bash base-images/build.sh jammy
 
 build-linux-builders: build-builder-alpine build-builder-jammy
@@ -79,10 +81,10 @@ build-buildpacks-jammy: build-sample-root
 
 build-linux-packages: build-sample-root
 	@echo "> Creating 'hello-world' buildpack package"
-	$(PACK_CMD) buildpack package cnbs/sample-package:hello-world --config $(SAMPLES_ROOT)/packages/hello-world/package.toml $(PULL_POLICY_NEVER)
+	$(PACK_CMD) buildpack package cnbs/sample-package:hello-world --config $(SAMPLES_ROOT)/$(PACKAGES_DIR)/hello-world/package.toml $(PULL_POLICY_NEVER)
 
 	@echo "> Creating 'hello-universe' buildpack package"
-	$(PACK_CMD) buildpack package cnbs/sample-package:hello-universe --config $(SAMPLES_ROOT)/packages/hello-universe/package.toml $(PULL_POLICY_NEVER)
+	$(PACK_CMD) buildpack package cnbs/sample-package:hello-universe --config $(SAMPLES_ROOT)/$(PACKAGES_DIR)/hello-universe/package.toml $(PULL_POLICY_NEVER)
 
 deploy-linux: deploy-linux-bases deploy-linux-packages deploy-linux-builders
 
@@ -190,10 +192,10 @@ build-buildpacks-dotnet-framework-2022: build-sample-root
 
 build-windows-packages: build-sample-root
 	@echo "> Creating 'hello-world-windows' buildpack package"
-	$(PACK_CMD) buildpack package cnbs/sample-package:hello-world-windows --config $(SAMPLES_ROOT)/packages/hello-world-windows/package.toml $(PULL_POLICY_NEVER)
+	$(PACK_CMD) buildpack package cnbs/sample-package:hello-world-windows --config $(SAMPLES_ROOT)/$(PACKAGES_DIR)/hello-world-windows/package.toml $(PULL_POLICY_NEVER)
 
 	@echo "> Creating 'hello-universe-windows' buildpack package"
-	$(PACK_CMD) buildpack package cnbs/sample-package:hello-universe-windows --config $(SAMPLES_ROOT)/packages/hello-universe-windows/package.toml $(PULL_POLICY_NEVER)
+	$(PACK_CMD) buildpack package cnbs/sample-package:hello-universe-windows --config $(SAMPLES_ROOT)/$(PACKAGES_DIR)/hello-universe-windows/package.toml $(PULL_POLICY_NEVER)
 
 deploy-windows-packages:
 	@echo "> Deploying windows packages..."
@@ -262,17 +264,20 @@ clean-windows:
 # workaround by pivoting samples-root to tmp path with tgz-buildpacks of the same name
 ifeq ($(OS),Windows_NT)
 SAMPLES_ROOT:=$(shell mkdir -p .tmp && mktemp --directory -p . .tmp/samples-XXX)
+PACKAGES_DIR:=packages
 build-sample-root:
 	@mkdir -p $(SAMPLES_ROOT)/buildpacks/
 
 	@for bp_dir in ./buildpacks/*/; do \
 		tar -czf $(SAMPLES_ROOT)/buildpacks/$$(basename $$bp_dir) -C $$bp_dir . ; \
 	done
 
-	@cp -r builders packages $(SAMPLES_ROOT)/
+	@cp -r builders $(SAMPLES_ROOT)/
+	@cp -r buildpacks $(SAMPLES_ROOT)/$(PACKAGES_DIR)
 else
 # No-op for posix pack
 SAMPLES_ROOT:=.
+PACKAGES_DIR:=buildpacks
 build-sample-root:
 endif
 

apps/ruby-bundler/Gemfile.lock

@@ -21,4 +21,4 @@ DEPENDENCIES
   sinatra
 
 BUNDLED WITH
-   2.0.2
+   2.3.26

base-images/alpine/run/curl.Dockerfile

@@ -1,7 +1,5 @@
 FROM curlimages/curl
 
-COPY ./Dockerfile /home/curl_user/Dockerfile
-
 RUN curl --version
 
 # Create user and group

base-images/jammy/base/Dockerfile

@@ -1,5 +1,8 @@
 FROM ubuntu:jammy
 
+# Workaround for docker <= 20.10.9
+RUN sed -i -e 's/^APT/# APT/' -e 's/^DPkg/# DPkg/' /etc/apt/apt.conf.d/docker-clean
+
 # Install packages that we want to make available at both build and run time
 RUN apt update && \
   apt install -y xz-utils ca-certificates libyaml-0-2 && \

builders/alpine/builder.toml

@@ -1,12 +1,12 @@
 # Buildpacks to include in builder
 [[buildpacks]]
 id = "samples/java-maven"
-version = "0.0.1"
+version = "0.0.2"
 uri = "../../buildpacks/java-maven"
 
 [[buildpacks]]
 id = "samples/kotlin-gradle"
-version = "0.0.1"
+version = "0.0.2"
 uri = "../../buildpacks/kotlin-gradle"
 
 [[buildpacks]]
@@ -42,12 +42,12 @@ version = "0.0.1"
 [[order]]
 [[order.group]]
 id = "samples/java-maven"
-version = "0.0.1"
+version = "0.0.2"
 
 [[order]]
 [[order.group]]
 id = "samples/kotlin-gradle"
-version = "0.0.1"
+version = "0.0.2"
 
 [[order]]
 [[order.group]]

builders/jammy/builder.toml

@@ -1,12 +1,12 @@
 # Buildpacks to include in builder
 [[buildpacks]]
 id = "samples/java-maven"
-version = "0.0.1"
+version = "0.0.2"
 uri = "../../buildpacks/java-maven"
 
 [[buildpacks]]
 id = "samples/kotlin-gradle"
-version = "0.0.1"
+version = "0.0.2"
 uri = "../../buildpacks/kotlin-gradle"
 
 [[buildpacks]]
@@ -21,12 +21,12 @@ uri = "docker://cnbs/sample-package:hello-universe"
 [[order]]
 [[order.group]]
 id = "samples/java-maven"
-version = "0.0.1"
+version = "0.0.2"
 
 [[order]]
 [[order.group]]
 id = "samples/kotlin-gradle"
-version = "0.0.1"
+version = "0.0.2"
 
 [[order]]
 [[order.group]]

packages/hello-universe-windows/package.toml → buildpacks/hello-universe-windows/package.toml

@@ -1,11 +1,11 @@
 [buildpack]
-uri = "../../buildpacks/hello-universe-windows"
+uri = "."
 
 [[dependencies]]
-uri = "../../buildpacks/hello-moon-windows"
+uri = "../hello-moon-windows"
 
 [[dependencies]]
-uri = "../../buildpacks/hello-world-windows"
+uri = "../hello-world-windows"
 # Alternatively, to use an image while packaging, you can use:
 # uri = "docker://cnbs/sample-package:hello-world-windows"
 

packages/hello-universe/package.toml → buildpacks/hello-universe/package.toml

@@ -1,10 +1,10 @@
 [buildpack]
-uri = "../../buildpacks/hello-universe/"
+uri = "."
 
 [[dependencies]]
-uri = "../../buildpacks/hello-moon"
+uri = "../hello-moon"
 
 [[dependencies]]
-uri = "../../buildpacks/hello-world"
+uri = "../hello-world"
 # Alternatively, to use an image while packaging, you can use:
 # uri = "docker://cnbs/sample-package:hello-world"

buildpacks/hello-world-windows/package.toml

@@ -0,0 +1,5 @@
+[buildpack]
+uri = "."
+
+[platform]
+os = "windows"

buildpacks/hello-world/package.toml

@@ -0,0 +1,2 @@
+[buildpack]
+uri = "."

buildpacks/java-maven/bin/build

@@ -59,15 +59,17 @@ EOF
     echo "${JAVA_HOME}/jre/lib/amd64/server:${LD_LIBRARY_PATH}" > ${jdk_layer_dir}/env/LD_LIBRARY_PATH
   fi
 
-  mkdir -p ${jdk_layer_dir}/profile.d
-  cat > "${jdk_layer_dir}/profile.d/jdk.sh" << EOF
-export JAVA_HOME=${jdk_layer_dir}
+  mkdir -p ${jdk_layer_dir}/exec.d
+  cat > "${jdk_layer_dir}/exec.d/jdk.sh" << EOF
+echo JAVA_HOME=${jdk_layer_dir}
 if [[ -z \$LD_LIBRARY_PATH ]]; then
-  export LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/amd64/server"
+  echo LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/amd64/server"
 else
-  export LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/amd64/server:${LD_LIBRARY_PATH}"
+  echo LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/amd64/server:${LD_LIBRARY_PATH}"
 fi
+echo PATH="\${PATH}:\${JAVA_HOME}/bin"
 EOF
+  chmod u+x,g+x "${jdk_layer_dir}/exec.d/jdk.sh"
 fi
 export JAVA_HOME=${jdk_layer_dir}
 

buildpacks/java-maven/buildpack.toml

@@ -4,7 +4,7 @@ api = "0.9"
 # Buildpack ID and metadata
 [buildpack]
 id = "samples/java-maven"
-version = "0.0.1"
+version = "0.0.2"
 name = "Sample Java Maven Buildpack"
 homepage = "https://github.com/buildpacks/samples/tree/main/buildpacks/java-maven"
 

buildpacks/kotlin-gradle/bin/build

@@ -56,14 +56,15 @@ EOF
     echo "${JAVA_HOME}/jre/lib/amd64/server:${LD_LIBRARY_PATH}" > ${jdk_layer_dir}/env/LD_LIBRARY_PATH
   fi
 
-  mkdir -p ${jdk_layer_dir}/profile.d
-  cat > "${jdk_layer_dir}/profile.d/jdk.sh" << EOF
-export JAVA_HOME=${jdk_layer_dir}
+  mkdir -p ${jdk_layer_dir}/exec.d
+  cat > "${jdk_layer_dir}/exec.d/jdk.sh" << EOF
+echo JAVA_HOME=${jdk_layer_dir}
 if [[ -z \$LD_LIBRARY_PATH ]]; then
-  export LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/amd64/server"
+  echo LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/amd64/server"
 else
-  export LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/amd64/server:${LD_LIBRARY_PATH}"
+  echo LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/amd64/server:${LD_LIBRARY_PATH}"
 fi
+echo PATH="\${PATH}:\${JAVA_HOME}/bin"
 EOF
 fi
 

buildpacks/kotlin-gradle/buildpack.toml

@@ -4,7 +4,7 @@ api = "0.9"
 # Buildpack ID and metadata
 [buildpack]
 id = "samples/kotlin-gradle"
-version = "0.0.1"
+version = "0.0.2"
 name = "Sample Kotlin Gradle Buildpack"
 homepage = "https://github.com/buildpacks/samples/tree/main/buildpacks/kotlin-gradle"
 

buildpacks/ruby-bundler/bin/build

@@ -44,7 +44,7 @@ if [[ -f Gemfile.lock && ${local_bundler_checksum} == ${remote_bundler_checksum}
 else
   # Determine if there has been a gem dependency change and install new gems to the bundler layer; re-using existing and un-changed gems
   echo "---> Installing gems"
-  mkdir "${bundler_layer_dir}"
+  mkdir -p "${bundler_layer_dir}"
   cat > "${bundler_layer_dir}.toml" <<EOL
 [types]
 cache = true

extensions/vim/extension.toml

@@ -5,6 +5,6 @@ api = "0.9"
 [extension]
 id = "samples/vim"
 version = "0.0.1"
-name = "Tree Extension"
-homepage = "https://github.com/buildpacks/samples/tree/main/extensions/vim"
+name = "Vim Extension"
+homepage = "https://github.com/buildpacks/samples/vim/main/extensions/vim"
 description = "A simple extension that installs vim on the builder image"