Skip to content

Commit 01fc804

Browse files
committed
fix(pack-images): workspace permission error
1 parent d903034 commit 01fc804

2 files changed

Lines changed: 9 additions & 13 deletions

File tree

Dockerfile.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ RUN cp -rf /var/lib/dpkg /var/lib/dpkg-run; \
1616
mv /var/lib/dpkg-run /var/lib/dpkg;
1717
ADD rootfs /
1818

19-
USER ${DRYCC_UID}
19+
USER ${CNB_USER_ID}:${CNB_GROUP_ID}

Dockerfile.run

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,18 @@ FROM ${BASE_IMAGE}
33

44
ARG STACK_ID
55

6-
ENV DRYCC_UID=1001 \
7-
DRYCC_GID=1001 \
8-
DRYCC_HOME_DIR=/workspace
6+
ENV CNB_USER_ID 1001
7+
ENV CNB_GROUP_ID 1001
8+
ENV CNB_STACK_ID ${STACK_ID}
9+
ENV CNB_APP_DIR /workspace
910

10-
RUN groupadd drycc --gid ${DRYCC_GID} \
11-
&& useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR} \
12-
&& chown ${DRYCC_GID}:${DRYCC_UID} /opt /etc/ld.so.conf.d \
11+
RUN groupadd drycc --gid ${CNB_USER_ID} \
12+
&& useradd drycc -u ${CNB_USER_ID} -g ${CNB_GROUP_ID} -s /bin/bash -m \
13+
&& chown ${CNB_USER_ID}:${CNB_GROUP_ID} /opt /etc/ld.so.conf.d \
1314
&& install-packages sudo \
1415
&& echo "drycc ALL=(root) NOPASSWD:/usr/sbin/ldconfig" > /etc/sudoers.d/drycc
1516

16-
USER ${DRYCC_UID}
17-
# Pack style, `=` cannot be used
18-
ENV CNB_USER_ID ${DRYCC_UID}
19-
ENV CNB_GROUP_ID ${DRYCC_GID}
20-
ENV CNB_STACK_ID ${STACK_ID}
21-
ENV CNB_APP_DIR ${DRYCC_HOME_DIR}
17+
USER ${CNB_USER_ID}:${CNB_GROUP_ID}
2218

2319
LABEL io.buildpacks.stack.id="${STACK_ID}"
2420

0 commit comments

Comments
 (0)