chore(pack-images): use debian base

Author: duanhongyi

Dockerfile.build

@@ -6,12 +6,12 @@ ARG pack_gid=1000
 
 ADD rootfs /
 
-RUN groupadd drycc --gid ${pack_gid} && \
-  useradd drycc -u ${pack_uid} -g ${pack_gid} -s /bin/bash -m
-RUN mkdir /app && \
-  chown drycc:drycc /app
-RUN chmod +x /usr/local/bin/* && \
-  install-tools.sh
+RUN groupadd drycc --gid ${pack_gid} \
+  && useradd drycc -u ${pack_uid} -g ${pack_gid} -s /bin/bash -m \
+  && chown -R drycc:drycc /usr/sbin/nginx /var/log/nginx \
+  && mkdir /app \
+  && chown drycc:drycc /app \
+  && chmod +x /usr/local/bin/*
 
 ENV CNB_USER_ID=${pack_uid}
 ENV CNB_GROUP_ID=${pack_gid}

Dockerfile.run

@@ -1,13 +1,13 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
-RUN ln -s /workspace /app
-
 ARG pack_uid=1000
 ARG pack_gid=1000
 
-RUN groupadd drycc --gid ${pack_gid} && \
-  useradd drycc -u ${pack_uid} -g ${pack_gid} -s /bin/bash -m
+RUN ln -s /workspace /app \
+  && groupadd drycc --gid ${pack_gid} \
+  && useradd drycc -u ${pack_uid} -g ${pack_gid} -s /bin/bash -m \
+  && chown -R drycc:drycc /usr/sbin/nginx /var/log/nginx
 
 ARG STACK
 LABEL io.buildpacks.stack.id="${STACK}"

Makefile

@@ -22,7 +22,7 @@ SHELL=/bin/bash -o pipefail
 pack:
 	@docker build --pull -f Dockerfile.build \
 	  --build-arg STACK=drycc-${STACK} \
-	  --build-arg BASE_IMAGE=${DRYCC_REGISTRY}/drycc/stack-images:${STACK}-build \
+	  --build-arg BASE_IMAGE=${DRYCC_REGISTRY}/drycc/stack-images:${STACK} \
 	  -t ${DRYCC_REGISTRY}/drycc/pack:${VERSION}-build .
 	@docker build --pull -f Dockerfile.run \
 	  --build-arg STACK=drycc-${STACK} \

README.md

@@ -14,3 +14,40 @@ with [Cloud Native Buildpacks'](https://buildpacks.io)
 ## Usage
 
 `pack build myapp --builder drycc/buildpacks:20`
+
+## System
+
+The basic image is based on Debian system, See the table below for system description：
+
+STACK ID     | Buildpacks image                | Operating System
+-------------|---------------------------------|---------------------------------
+drycc-20     | docker.io/drycc/buildpacks:20   | Debian 11 Bullseye 
+
+The basic layer of buildpack supports custom software sources and custom software.
+For example, if we use alicloud to install libpq-dev, we can add `.deb-list` and `·source-list` files to the project.
+
+```
+cat > ".source-list" <<EOL
+deb http://mirrors.cloud.aliyuncs.com/debian/ bullseye main non-free contrib
+deb-src http://mirrors.cloud.aliyuncs.com/debian/ bullseye main non-free contrib
+deb http://mirrors.cloud.aliyuncs.com/debian-security bullseye/updates main
+deb-src http://mirrors.cloud.aliyuncs.com/debian-security bullseye/updates main
+deb http://mirrors.cloud.aliyuncs.com/debian/ bullseye-updates main non-free contrib
+deb-src http://mirrors.cloud.aliyuncs.com/debian/ bullseye-updates main non-free contrib
+deb http://mirrors.cloud.aliyuncs.com/debian/ bullseye-backports main non-free contrib
+deb-src http://mirrors.cloud.aliyuncs.com/debian/ bullseye-backports main non-free contrib
+EOL
+
+cat > ".deb-list" <<EOL
+libpq-dev
+EOL
+```
+
+## Reference
+
+Pack Images bundles the following technologies together into a single cohesive distribution:
+
+* [Stack Images](https://github.com/drycc/stack-images)
+* [Pack Runtimes](https://github.com/drycc/pack-runtimes)
+* [Pack CLI](https://github.com/buildpacks/pack)
+* [Buildpacks lifecycle](https://github.com/buildpacks/lifecycle)

buildpacks/go/bin/build

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# shellcheck source=/dev/null
+. generate-layer.sh
 set -eo pipefail
 
 echo "---> Go Buildpack"
@@ -10,20 +12,20 @@ plan_path=$3
 # 2. DOWNLOAD go
 go_layer_dir="${layers_dir}/go"
 mkdir -p "${go_layer_dir}"
-arch=$(dpkg --print-architecture)  # amd64 arm64
+arch=$(dpkg --print-architecture) # amd64 arm64
 # determine go version provided during detection
-go_version=$(< "${plan_path}" yj -t | jq -r '.entries[] | select(.name == "go") | .version')
+go_version=$(yj <"${plan_path}" -t | jq -r '.entries[] | select(.name == "go") | .version')
 remote_go_version='not found'
 if [[ -f "${go_layer_dir}.toml" ]]; then
-    remote_go_version=$(< "${go_layer_dir}.toml" yj -t | jq -r .metadata 2>/dev/null || echo 'not found')
+  remote_go_version=$(yj <"${go_layer_dir}.toml" -t | jq -r .metadata 2>/dev/null || echo 'not found')
 fi
-if [[ "${go_version}" == "${remote_go_version}" ]] ; then
+if [[ "${go_version}" == "${remote_go_version}" ]]; then
   echo "---> Reusing go"
 else
   echo "---> Downloading and extracting go ${go_version}"
   go_url=https://golang.org/dl/go${go_version}.linux-${arch}.tar.gz
   wget -q -O - "${go_url}" | tar -xzf - -C "${go_layer_dir}"
-  cat > "${go_layer_dir}.toml" <<EOL
+  cat >"${go_layer_dir}.toml" <<EOL
 cache = true
 build = true
 launch = true
@@ -40,17 +42,17 @@ export GOPATH="${go_cache_layer_dir}"
 local_mod_checksum=$(sha256sum go.mod | cut -d ' ' -f 1 || echo 'not found')
 remote_mod_checksum='not found'
 if [[ -f "${go_cache_layer_dir}.toml" ]]; then
-    remote_mod_checksum=$(< "${go_cache_layer_dir}.toml" yj -t | jq -r .metadata 2>/dev/null || echo 'not found')
+  remote_mod_checksum=$(yj <"${go_cache_layer_dir}.toml" -t | jq -r .metadata 2>/dev/null || echo 'not found')
 fi
 mkdir -p "${go_cache_layer_dir}"
 
-if [[ -f go.mod && "${local_mod_checksum}" == "${remote_mod_checksum}" ]] ; then
+if [[ -f go.mod && "${local_mod_checksum}" == "${remote_mod_checksum}" ]]; then
   echo "---> Reusing go.mod"
 else
   echo "---> Installing go.mod with go mod vendor"
   rm "${go_cache_layer_dir}/pkg" -rf
   go mod download
-  cat > "${go_cache_layer_dir}.toml" <<EOL
+  cat >"${go_cache_layer_dir}.toml" <<EOL
 cache = true
 build = true
 launch = true

buildpacks/go/bin/detect

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
-# 1. CHECK IF APPLICABLE 
+# 1. CHECK IF APPLICABLE
 if [ ! -f "go.mod" ] && [ ! -f "setup.py" ]; then
-   exit 100
+    exit 100
 fi
 
 # 2. GET ARGS
@@ -12,11 +12,11 @@ plan_path=$2
 # 3. GET CONFIGURATION
 version=1.16
 if [[ -f go.mod ]]; then
-    version=$(< go.mod grep 'go [1.*]' | tr -d 'go ')
+    version=$(grep <go.mod 'go [1.*]' | tr -d 'go ')
 fi
 
 # 4. DECLARE DEPENDENCIES
-cat >> "${plan_path}" <<EOL
+cat >>"${plan_path}" <<EOL
 # Buildpack provides this dependency
 #
 # NOTE: The dependency is provided during the 'build' process.

buildpacks/java/README.md

@@ -3,8 +3,17 @@
 Compatible apps:
 - Java apps
 
-### Usage
+## Usage
 
 ```bash
 pack build java-project --builder drycc/buildpacks:20
-```
+```
+
+## Version
+
+You can generate a declared version of `.jdk-version` in the directory.
+
+```
+cat > ".jdk-version" <<EOL
+x.y.z
+EOL

buildpacks/java/bin/build

@@ -1,80 +1,82 @@
 #!/usr/bin/env bash
+# shellcheck source=/dev/null
+. generate-layer.sh
 set -eo pipefail
 
 echo "---> Java Buildpack"
 #amd64 aarch64
 arch=$(dpkg --print-architecture)
 if [ "${arch}" == "arm64" ]; then
-    arch="aarch64"
+  arch="aarch64"
 fi
 # 1. GET ARGS
 bp_dir=$(
-	cd "$(dirname "$0")"/..
-	pwd
+  cd "$(dirname "$0")"/..
+  pwd
 )
 layers_dir=$1
 env_dir="$2/env"
 plan_path=$3
 
 # 2. LOAD USER-PROVIDED BUILD-TIME ENVIRONMENT VARIABLES
-if compgen -G "${env_dir}"/* > /dev/null; then
+if compgen -G "${env_dir}"/* >/dev/null; then
   for var in "${env_dir}"/*; do
     declare "$(basename "${var}")=$(<"${var}")"
   done
 fi
 
 # 3. INSTALL JAVA
 get_jdk_url() {
-	if [ "${arch}" == "amd64" ]; then
-	  local arch="x64"
+  if [ "${arch}" == "amd64" ]; then
+    local arch="x64"
   fi
-	if [ "${version}" == "8" ]; then
+  if [ "${version}" == "8" ]; then
     echo "https://github.com/AdoptOpenJDK/openjdk8-upstream-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_${arch}_linux_8u292b10.tar.gz"
   elif [ "${version}" == "11" ]; then
     echo "https://github.com/AdoptOpenJDK/openjdk11-upstream-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_${arch}_linux_11.0.11_9.tar.gz"
   elif [ "${version}" == "16" ]; then
     echo "https://download.java.net/java/GA/jdk16.0.1/7147401fd7354114ac51ef3e1328291f/9/GPL/openjdk-16.0.1_linux-${arch}_bin.tar.gz"
   elif [ "${version}" == "17" ]; then
     echo "https://download.java.net/java/early_access/jdk17/28/GPL/openjdk-17-ea+28_linux-${arch}_bin.tar.gz"
-	elif [ "${version}" == "18" ]; then
-		echo "https://download.java.net/java/early_access/jdk18/3/GPL/openjdk-18-ea+3_linux-${arch}_bin.tar.gz"
-	else
-		echo "${version}"
-	fi
+  elif [ "${version}" == "18" ]; then
+    echo "https://download.java.net/java/early_access/jdk18/3/GPL/openjdk-18-ea+3_linux-${arch}_bin.tar.gz"
+  else
+    echo "${version}"
+  fi
 }
 
-version=$(< "${plan_path}" yj -t | jq -r '.entries[] | select(.name == "jdk") | .version')
+version=$(yj <"${plan_path}" -t | jq -r '.entries[] | select(.name == "jdk") | .version')
 jdk_url="$(get_jdk_url)"
 
 # If it doesn't exist locally, create a JDK cache layer
 # This makes JDK available to subsequent buildpacks as well
 jdk_layer_dir=${layers_dir}/jdk
 if [[ -f "${jdk_layer_dir}.toml" ]]; then
-  cached_jdk_url=$(< "${jdk_layer_dir}.toml" yj -t | jq -r .metadata.url 2>/dev/null || echo 'JDK TOML parsing failed')
+  cached_jdk_url=$(yj <"${jdk_layer_dir}.toml" -t | jq -r .metadata.url 2>/dev/null || echo 'JDK TOML parsing failed')
 fi
 
-if [[ "${jdk_url}" != "${cached_jdk_url}" ]] ; then
+if [[ "${jdk_url}" != "${cached_jdk_url}" ]]; then
   echo "---> Downloading JDK"
   rm -rf "${layers_dir}"/jdk
   mkdir -p "${layers_dir}"/jdk/env
   wget -q -O - "${jdk_url}" | tar pxz -C "${jdk_layer_dir}" --strip-components=1
-  cat > "${jdk_layer_dir}.toml" << EOF
+  cat >"${jdk_layer_dir}.toml" <<EOF
 launch = true
 build = true
 cache = true
 [metadata]
 version = "${version}"
 EOF
 
-  echo "${layers_dir}"/jdk > "${layers_dir}"/jdk/env/JAVA_HOME
+  echo "${layers_dir}"/jdk >"${layers_dir}"/jdk/env/JAVA_HOME
   if [[ -z "${LD_LIBRARY_PATH}" ]]; then
-    echo "${JAVA_HOME}/jre/lib/${arch}/server" > "${jdk_layer_dir}/env/LD_LIBRARY_PATH"
+    echo "${JAVA_HOME}/jre/lib/${arch}/server" >"${jdk_layer_dir}/env/LD_LIBRARY_PATH"
   else
-    echo "${JAVA_HOME}/jre/lib/${arch}/server:${LD_LIBRARY_PATH}" > "${jdk_layer_dir}"/env/LD_LIBRARY_PATH
+    echo "${JAVA_HOME}/jre/lib/${arch}/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
+  cat >"${jdk_layer_dir}/profile.d/jdk.sh" <<EOF
 export JAVA_HOME="${jdk_layer_dir}"
 if [[ -z \$LD_LIBRARY_PATH ]]; then
   export LD_LIBRARY_PATH="\$JAVA_HOME/jre/lib/${arch}/server"
@@ -97,33 +99,33 @@ source "$bp_dir/lib/gradle_build"
 source "$bp_dir/lib/maven_build"
 build_choice="maven"
 if [ -f pom.xml ] && [ -f gradlew ]; then
-    if [[ -f .build-choice ]]; then
-        build_choice=$(< .build-choice tr -d '[:space:]')
-    fi
+  if [[ -f .build-choice ]]; then
+    build_choice=$(tr <.build-choice -d '[:space:]')
+  fi
 elif [ -f pom.xml ] && [ ! -f gradlew ]; then
-    build_choice="maven"
+  build_choice="maven"
 elif [ -f gradlew ] && [ ! -f pom.xml ]; then
-    build_choice="gradle"
+  build_choice="gradle"
 fi
 
 if [ "${build_choice}" == "maven" ]; then
-    maven_build
+  maven_build
 elif [ "${build_choice}" == "gradle" ]; then
-    gradle_build
+  gradle_build
 fi
 
 # 6. SET DEFAULT START COMMAND
 if [ -f Procfile ]; then
-    generate-launch.sh "${layers_dir}"
+  generate-launch.sh "${layers_dir}"
 else
-    target_dir="build/libs"
-    # shellcheck disable=SC2044
-    for jar_file in $(find "$target_dir" -maxdepth 1 -name "*.jar" -type f); do
-      cat >> "${layers_dir}/launch.toml" <<EOL
+  target_dir="build/libs"
+  # shellcheck disable=SC2044
+  for jar_file in $(find "$target_dir" -maxdepth 1 -name "*.jar" -type f); do
+    cat >>"${layers_dir}/launch.toml" <<EOL
 [[processes]]
 type = "web"
 command = "java -jar ${jar_file}"
 EOL
-  break;
-done
+    break
+  done
 fi

buildpacks/java/bin/detect

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -eo pipefail
 
-# 1. CHECK IF APPLICABLE 
-if [[ ! -f pom.xml ]] && [[ ! -f gradlew ]] ; then
+# 1. CHECK IF APPLICABLE
+if [[ ! -f pom.xml ]] && [[ ! -f gradlew ]]; then
     exit 100
 fi
 
@@ -12,10 +12,10 @@ plan_path=$2
 # 3. GET CONFIGURATION
 version=8
 if [[ -f .jdk-version ]]; then
-    version=$(< .jdk-version tr -d '[:space:]')
+    version=$(tr <.jdk-version -d '[:space:]')
 fi
 # 4. DECLARE DEPENDENCIES
-cat >> "${plan_path}" <<EOL
+cat >>"${plan_path}" <<EOL
 # Buildpack provides this dependency
 #
 # NOTE: The dependency is provided during the 'build' process.

buildpacks/java/lib/maven_build

@@ -35,7 +35,7 @@ version = "${maven_version}"
 url = "${maven_url}"
 EOF
     fi
-    export PATH="${PATH}:${layers_dir}/maven/bin"
+    export PATH="${layers_dir}/maven/bin:${PATH}"
     echo "---> Running Maven Wrapper"
     mvn clean install -B -DskipTests
   fi