chore(pack-images): change image to drycc base

Author: duanhongyi

Dockerfile.build

@@ -1,24 +1,19 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
-ARG pack_uid=1000
-ARG pack_gid=1000
-
+USER root
+RUN cp -rf /var/lib/dpkg /var/lib/dpkg-run; \
+  \
+  \
+  install-packages zlib1g git autoconf pkg-config build-essential; \
+  install-stack jq 1.6; \
+  install-stack yj 5.0.0; \
+  cp -rf /opt/drycc/*/bin/* /usr/local/bin; \
+  rm -rf /opt/drycc/*; \
+  \
+  \
+  rm -rf /var/lib/dpkg; \
+  mv /var/lib/dpkg-run /var/lib/dpkg;
 ADD rootfs /
 
-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}
-
-ARG STACK
-ENV STACK "${STACK}"
-ENV CNB_STACK_ID "${STACK}"
-LABEL io.buildpacks.stack.id="${STACK}"
-
-USER drycc
+USER drycc

Dockerfile.run

@@ -1,15 +1,24 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
-ARG pack_uid=1000
-ARG pack_gid=1000
+ARG STACK_ID
 
-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 PACK_UID=1000
+ARG PACK_GID=1000
+ARG CNB_APP_DIR=/workspace
+
+RUN groupadd drycc --gid ${PACK_GID}; \
+  useradd drycc -u ${PACK_UID} -g ${PACK_GID} -s /bin/bash -m -d ${CNB_APP_DIR}; \
+  chown drycc:drycc /opt;
 
-ARG STACK
-LABEL io.buildpacks.stack.id="${STACK}"
 USER drycc
-ENV HOME /app
+
+ENV CNB_USER_ID ${PACK_UID}
+ENV CNB_GROUP_ID ${PACK_GID}
+ENV CNB_STACK_ID ${STACK_ID}
+ENV CNB_APP_DIR ${CNB_APP_DIR}
+ENV HOME ${CNB_APP_DIR}
+
+LABEL io.buildpacks.stack.id="${STACK_ID}"
+
+

Makefile

@@ -1,45 +1,45 @@
 # If DRYCC_REGISTRY is not set, try to populate it from legacy DEV_REGISTRY
-STACK ?= 20
-VERSION ?= ${STACK}
+CODENAME ?= bullseye
 DEV_REGISTRY ?= docker.io
 DRYCC_REGISTRY ?= ${DEV_REGISTRY}
-
+PLATFORM ?= $(shell python3 _scripts/utils.py platform)
 ARCH ?= $(shell python3 _scripts/utils.py arch)
-LIFECYCLE_VERSION ?= v0.12.0-rc.1
+LIFECYCLE_VERSION ?= v0.13.3
 ifeq ($(ARCH),amd64)
 LIFECYCLE_URL = https://github.com/buildpacks/lifecycle/releases/download/$(LIFECYCLE_VERSION)/lifecycle-${LIFECYCLE_VERSION}+linux.x86-64.tgz
 else
 LIFECYCLE_URL = https://github.com/buildpacks/lifecycle/releases/download/$(LIFECYCLE_VERSION)/lifecycle-${LIFECYCLE_VERSION}+linux.${ARCH}.tgz
 endif
-STACK_RUN_IMAGE = docker.io/drycc/pack:20-linux-${ARCH}
-STACK_BUILD_IMAGE = docker.io/drycc/pack:20-linux-${ARCH}-build
+STACK_ID = drycc-${CODENAME}
+STACK_RUN_IMAGE = ${DRYCC_REGISTRY}/drycc/pack:${CODENAME}-${PLATFORM}-${ARCH}
+STACK_BUILD_IMAGE = ${DRYCC_REGISTRY}/drycc/pack:${CODENAME}-${PLATFORM}-${ARCH}-build
+BUILDPACKS_IMAGE = ${DRYCC_REGISTRY}/drycc/buildpacks:${CODENAME}-${PLATFORM}-${ARCH}
 
 SHELLCHECK_PREFIX := docker run --rm -v ${CURDIR}:/workdir -w /workdir ${DRYCC_REGISTRY}/drycc/go-dev shellcheck
 SHELL_SCRIPTS = $(shell find "buildpacks" -name '*.sh') $(shell find "rootfs" -name '*.sh') $(wildcard buildpacks/*/bin/*)
 
 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} \
-	  -t ${DRYCC_REGISTRY}/drycc/pack:${VERSION}-build .
 	@docker build --pull -f Dockerfile.run \
-	  --build-arg STACK=drycc-${STACK} \
-	  --build-arg BASE_IMAGE=${DRYCC_REGISTRY}/drycc/stack-images:${STACK} \
-	  -t ${DRYCC_REGISTRY}/drycc/pack:${VERSION} .
+	  --build-arg STACK_ID=${STACK_ID} \
+	  --build-arg BASE_IMAGE=${DRYCC_REGISTRY}/drycc/base:${CODENAME} \
+	  -t ${STACK_RUN_IMAGE} .
+	@docker build -f Dockerfile.build \
+	  --build-arg BASE_IMAGE=${STACK_RUN_IMAGE} \
+	  -t ${STACK_BUILD_IMAGE} .
 
 publish-pack: pack
-	@docker push ${DRYCC_REGISTRY}/drycc/pack:${VERSION}-build
-	@docker push ${DRYCC_REGISTRY}/drycc/pack:${VERSION}
+	@docker push ${STACK_RUN_IMAGE}
+	@docker push ${STACK_BUILD_IMAGE}
 
 buildpack:
-	LIFECYCLE_URL=${LIFECYCLE_URL} STACK_RUN_IMAGE=${STACK_RUN_IMAGE} STACK_BUILD_IMAGE=${STACK_BUILD_IMAGE} python3 _scripts/utils.py toml builder.toml builder.toml.${ARCH}
-	@pack builder create ${DRYCC_REGISTRY}/drycc/buildpacks:${VERSION} --config builder.toml.${ARCH} --pull-policy if-not-present
-	@rm -rf builder.toml.${ARCH}
+	STACK_ID=${STACK_ID} LIFECYCLE_URL=${LIFECYCLE_URL} STACK_RUN_IMAGE=${STACK_RUN_IMAGE} STACK_BUILD_IMAGE=${STACK_BUILD_IMAGE} python3 _scripts/utils.py toml builder.toml builder.toml.${PLATFORM}.${ARCH}
+	@pack builder create ${BUILDPACKS_IMAGE} --config builder.toml.${PLATFORM}.${ARCH} --pull-policy if-not-present
+	@rm -rf builder.toml.${PLATFORM}.${ARCH}
 
 publish-buildpack: buildpack
-	@docker push ${DRYCC_REGISTRY}/drycc/buildpacks:${VERSION}
+	@docker push ${BUILDPACKS_IMAGE}
 
 publish: publish-pack publish-buildpack
 

_scripts/utils.py

@@ -1,6 +1,6 @@
 import os
 import sys
-import platform
+import platform as _platform
 
 def toml():
     result = None
@@ -10,6 +10,9 @@ def toml():
     with open(sys.argv[3], "w") as f:
         f.write(result)
 
+def platform():
+    print(sys.platform)
+
 def arch():
     print({
         "armv5": "armv5",
@@ -19,7 +22,7 @@ def arch():
         "x86_64": "amd64",
         "i686": "386",
         "i386": "386",
-    }.get(platform.machine()))
+    }.get(_platform.machine()))
 
 if __name__ == "__main__":
     eval("%s()" % sys.argv[1])

builder.toml

@@ -1,4 +1,4 @@
-description = "Base builder for 20 stack, based on ubuntu:20.04 base image"
+description = "Base builder for drycc stack, based on debian base image"
 
 [lifecycle]
 uri = "{LIFECYCLE_URL}"
@@ -35,13 +35,13 @@ version = "0.0.1"
 
 
 [[buildpacks]]
-  id = "drycc/nodejs"
+  id = "drycc/node"
   version = "0.0.1"
-  uri = "./buildpacks/nodejs"
+  uri = "./buildpacks/node"
 
 [[order]]
 [[order.group]]
-id = "drycc/nodejs"
+id = "drycc/node"
 version = "0.0.1"
 
 
@@ -76,6 +76,6 @@ id = "drycc/php"
 version = "0.0.1"
 
 [stack]
-id = "drycc-20"
+id = "{STACK_ID}"
 run-image = "{STACK_RUN_IMAGE}"
 build-image = "{STACK_BUILD_IMAGE}"

buildpacks/go/bin/build

@@ -1,6 +1,4 @@
 #!/usr/bin/env bash
-# shellcheck source=/dev/null
-. generate-layer.sh
 set -eo pipefail
 
 echo "---> Go Buildpack"
@@ -9,34 +7,18 @@ echo "---> Go Buildpack"
 layers_dir=$1
 plan_path=$3
 
-# 2. DOWNLOAD go
-go_layer_dir="${layers_dir}/go"
-mkdir -p "${go_layer_dir}"
-arch=$(dpkg --print-architecture) # amd64 arm64
-# determine go version provided during detection
-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=$(yj <"${go_layer_dir}.toml" -t | jq -r .metadata 2>/dev/null || echo 'not found')
-fi
-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
-cache = true
-build = true
-launch = true
-metadata = "${go_version}"
-EOL
-fi
+rm -rf /opt/drycc; ln -s "${layers_dir}" /opt/drycc
+# shellcheck source=/dev/null
+. generate-layers.sh "${layers_dir}"
+generate_deps_layer build-deps
+generate_deps_layer run-deps
 
+# 2. DOWNLOAD go
+generate_stack_layer go "${plan_path}" false
 go_cache_layer_dir="${layers_dir}/go_cache"
-# 3. MAKE go AVAILABLE TO THIS SCRIPT
-export PATH="${go_layer_dir}/go/bin:${PATH}"
-export GOPATH="${go_cache_layer_dir}"
+
+# shellcheck source=/dev/null
+. init-stack
 
 # Compares previous go.mod checksum to the current go.mod
 local_mod_checksum=$(sha256sum go.mod | cut -d ' ' -f 1 || echo 'not found')
@@ -53,13 +35,16 @@ else
   rm "${go_cache_layer_dir}/pkg" -rf
   go mod download
   cat >"${go_cache_layer_dir}.toml" <<EOL
+[types]
 cache = true
 build = true
-launch = true
-metadata = "${local_mod_checksum}"
+launch = false
+
+[metadata]
+version = "${local_mod_checksum}"
 EOL
 fi
 
 go mod vendor
 go build -o main -v .
-generate-launch.sh "${layers_dir}"
+generate-launch.sh "${layers_dir}"

buildpacks/go/bin/detect

@@ -2,34 +2,26 @@
 set -eo pipefail
 
 # 1. CHECK IF APPLICABLE
-if [ ! -f "go.mod" ] && [ ! -f "setup.py" ]; then
+if [ ! -f "go.mod" ]; then
     exit 100
 fi
 
 # 2. GET ARGS
 plan_path=$2
 
 # 3. GET CONFIGURATION
-version=1.16
+version=1.17
 if [[ -f go.mod ]]; then
     version=$(grep <go.mod 'go [1.*]' | tr -d 'go ')
 fi
 
 # 4. DECLARE DEPENDENCIES
 cat >>"${plan_path}" <<EOL
-# Buildpack provides this dependency
-#
-# NOTE: The dependency is provided during the 'build' process.
-#
 [[provides]]
 name = "go"
 
-# 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 = "go"
+[requires.metadata]
 version = "${version}"
 EOL

buildpacks/go/buildpack.toml

@@ -1,5 +1,5 @@
 # Buildpack API version
-api = "0.2"
+api = "0.7"
 
 # Buildpack ID and metadata
 [buildpack]
@@ -10,4 +10,4 @@ homepage = "https://github.com/drycc/pack-images/tree/main/buildpacks/go"
 
 # Stacks that the buildpack will work with
 [[stacks]]
-id = "drycc-20"
+id = "drycc-bullseye"