Skip to content

Commit 546bc82

Browse files
committed
chore(pack-images): use DRYCC_UID DRYCC_GID env
1 parent 5ffe1d8 commit 546bc82

2 files changed

Lines changed: 7 additions & 8 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
19+
USER ${DRYCC_UID}

Dockerfile.run

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@ FROM ${BASE_IMAGE}
33

44
ARG STACK_ID
55

6-
ARG DRYCC_UID=1001
7-
ARG DRYCC_GID=1001
8-
ARG DRYCC_HOME_DIR=/workspace
6+
ENV DRYCC_UID=1001 \
7+
DRYCC_GID=1001 \
8+
DRYCC_HOME_DIR=/workspace
99

1010
RUN groupadd drycc --gid ${DRYCC_GID} \
1111
&& useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR} \
12-
&& chown drycc:drycc /opt
13-
14-
USER drycc
12+
&& chown ${DRYCC_GID}:${DRYCC_UID} /opt
1513

14+
USER ${DRYCC_UID}
15+
# Pack style, `=` cannot be used
1616
ENV CNB_USER_ID ${DRYCC_UID}
1717
ENV CNB_GROUP_ID ${DRYCC_GID}
1818
ENV CNB_STACK_ID ${STACK_ID}
1919
ENV CNB_APP_DIR ${DRYCC_HOME_DIR}
20-
ENV HOME ${DRYCC_HOME_DIR}
2120

2221
LABEL io.buildpacks.stack.id="${STACK_ID}"
2322

0 commit comments

Comments
 (0)