Skip to content

Commit 1097406

Browse files
committed
fix: missing users in build process
1 parent 104443c commit 1097406

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

ci/build-and-publish.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ set -ex
1111
# Example: NODE_VER=20 platform=-debian-rdkafka ./ci/build-and-publish.sh
1212
# Example: NODE_VER=21 platform=-debian-rdkafka ./ci/build-and-publish.sh
1313

14-
cp ~/.env.aws-s3-credentials .env
15-
env IMAGE_TAG=${NODE_VER}${platform} UID=${UID} PNPM_STORE=$(pnpm config get store-dir) docker-compose up -d
16-
docker-compose exec tester pnpm i --frozen-lockfile --prefer-offline --ignore-scripts
17-
docker-compose exec tester pnpm binary:build
18-
docker-compose exec tester pnpm binary:package
19-
docker-compose exec tester pnpm binary:test
20-
docker-compose exec tester pnpm binary:publish
14+
if [ x"$CI" = x"true" ]; then
15+
cp ~/.env.aws-s3-credentials .env
16+
fi
17+
env IMAGE_TAG=${NODE_VER}${platform} UID=${UID} PNPM_STORE="$(pnpm config get store-dir)" docker-compose up -d
18+
env UID=${UID} docker-compose exec -u ${UID} tester pnpm i --frozen-lockfile --prefer-offline --ignore-scripts
19+
env UID=${UID} docker-compose exec -u ${UID} tester pnpm binary:build
20+
env UID=${UID} docker-compose exec -u ${UID} tester pnpm binary:package
21+
env UID=${UID} docker-compose exec -u ${UID} tester pnpm binary:test
22+
env UID=${UID} docker-compose exec -u ${UID} tester pnpm binary:publish

ci/npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
store-dir=/tmp/.pnpm-store
2+
package-import-method=clone-or-copy

docker-compose.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ services:
3838
- ${PWD}:/src
3939
- ${PWD}/ci/npmrc:/usr/local/etc/npmrc:ro
4040
- ${PNPM_STORE:-~/.pnpm-store}:/tmp/.pnpm-store
41-
command: tail -f /dev/null
42-
user: "${UID:-1000}:${UID:-1000}"
41+
command: /bin/sh -c "addgroup --gid 501 builder; useradd -g ${UID} -u ${UID} --create-home builder; exec tail -f /dev/null"
4342
network_mode: host
4443
env_file:
4544
- .env
4645
environment:
4746
- UV_THREADPOOL_SIZE=16
47+
- CI=true
48+
- UID=${UID:-1000}

0 commit comments

Comments
 (0)