File tree Expand file tree Collapse file tree 3 files changed +4
-8
lines changed Expand file tree Collapse file tree 3 files changed +4
-8
lines changed Original file line number Diff line number Diff line change 4
4
ID_PREFIX=" io.buildpacks.samples.stacks"
5
5
6
6
DEFAULT_PREFIX=cnbs/sample-base
7
- DEFAULT_PLATFORM=amd64
7
+ DEFAULT_PLATFORM=linux/ amd64
8
8
9
9
REPO_PREFIX=${DEFAULT_PREFIX}
10
10
PLATFORM=${DEFAULT_PLATFORM}
@@ -63,17 +63,10 @@ BUILD_IMAGE=${REPO_PREFIX}-build:${TAG}
63
63
FROM_IMAGE=$( head -n1 " ${IMAGE_DIR} " /base/Dockerfile | cut -d' ' -f2)
64
64
65
65
# Get target distro information
66
- if cmd /c ver; then
67
- DISTRO_NAME=" "
68
- RAW_VERSION=$( docker run --rm " ${FROM_IMAGE} " cmd /c ver)
69
- DISTRO_VERSION=$( echo " $RAW_VERSION " | head -n1 | sed ' s/Microsoft Windows //' | sed ' s/[][]//g' | cut -d' ' -f2)
70
- echo " DISTRO_VERSION: ${DISTRO_VERSION} "
71
- else
72
66
DISTRO_NAME=$( docker run --rm " ${FROM_IMAGE} " cat /etc/os-release | grep ' ^ID=' | cut -d' =' -f2)
73
67
echo " DISTRO_NAME: ${DISTRO_NAME} "
74
68
DISTRO_VERSION=$( docker run --rm " ${FROM_IMAGE} " cat /etc/os-release | grep ' ^VERSION_ID=' | cut -d' =' -f2)
75
69
echo " DISTRO_VERSION: ${DISTRO_VERSION} "
76
- fi
77
70
78
71
if [[ -d " ${IMAGE_DIR} /base" ]]; then
79
72
docker build --platform=${PLATFORM} \
Original file line number Diff line number Diff line change @@ -8,6 +8,8 @@ RUN apt update && \
8
8
9
9
COPY ./bin/yj-linux /usr/local/bin/yj
10
10
11
+ COPY ./cnb/build-config/env/* /cnb/build-config/env/
12
+
11
13
# Create user and group
12
14
ARG cnb_uid=1001
13
15
ARG cnb_gid=1001
Original file line number Diff line number Diff line change
1
+ https://pypi.org/simple
You can’t perform that action at this time.
0 commit comments