From 45348cfa39924b20976b62698bed3194fd00a310 Mon Sep 17 00:00:00 2001 From: adelaney21 Date: Wed, 2 Apr 2025 11:14:12 +0100 Subject: [PATCH] Provide build-config example Override the pip index url, which does not impact any of our other examples Signed-off-by: adelaney21 --- base-images/build.sh | 9 +-------- base-images/noble/build/Dockerfile | 2 ++ .../build/cnb/build-config/env/PIP_INDEX_URL.override | 1 + 3 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 base-images/noble/build/cnb/build-config/env/PIP_INDEX_URL.override diff --git a/base-images/build.sh b/base-images/build.sh index 5203c49..d561f23 100755 --- a/base-images/build.sh +++ b/base-images/build.sh @@ -4,7 +4,7 @@ set -e ID_PREFIX="io.buildpacks.samples.stacks" DEFAULT_PREFIX=cnbs/sample-base -DEFAULT_PLATFORM=amd64 +DEFAULT_PLATFORM=linux/amd64 REPO_PREFIX=${DEFAULT_PREFIX} PLATFORM=${DEFAULT_PLATFORM} @@ -63,17 +63,10 @@ BUILD_IMAGE=${REPO_PREFIX}-build:${TAG} FROM_IMAGE=$(head -n1 "${IMAGE_DIR}"/base/Dockerfile | cut -d' ' -f2) # Get target distro information -if cmd /c ver; then -DISTRO_NAME="" -RAW_VERSION=$(docker run --rm "${FROM_IMAGE}" cmd /c ver) -DISTRO_VERSION=$(echo "$RAW_VERSION" | head -n1 | sed 's/Microsoft Windows //' | sed 's/[][]//g' | cut -d' ' -f2) -echo "DISTRO_VERSION: ${DISTRO_VERSION}" -else DISTRO_NAME=$(docker run --rm "${FROM_IMAGE}" cat /etc/os-release | grep '^ID=' | cut -d'=' -f2) echo "DISTRO_NAME: ${DISTRO_NAME}" DISTRO_VERSION=$(docker run --rm "${FROM_IMAGE}" cat /etc/os-release | grep '^VERSION_ID=' | cut -d'=' -f2) echo "DISTRO_VERSION: ${DISTRO_VERSION}" -fi if [[ -d "${IMAGE_DIR}/base" ]]; then docker build --platform=${PLATFORM} \ diff --git a/base-images/noble/build/Dockerfile b/base-images/noble/build/Dockerfile index e449ee0..0bedcf7 100755 --- a/base-images/noble/build/Dockerfile +++ b/base-images/noble/build/Dockerfile @@ -8,6 +8,8 @@ RUN apt update && \ COPY ./bin/yj-linux /usr/local/bin/yj +COPY ./cnb/build-config/env/* /cnb/build-config/env/ + # Create user and group ARG cnb_uid=1001 ARG cnb_gid=1001 diff --git a/base-images/noble/build/cnb/build-config/env/PIP_INDEX_URL.override b/base-images/noble/build/cnb/build-config/env/PIP_INDEX_URL.override new file mode 100644 index 0000000..e12f194 --- /dev/null +++ b/base-images/noble/build/cnb/build-config/env/PIP_INDEX_URL.override @@ -0,0 +1 @@ +https://pypi.org/simple \ No newline at end of file