Skip to content

Commit 79ce919

Browse files
jakulehatched
authored andcommitted
Run webassets build in Docker as current OS user (#20426)
Set the current user when running webassets builds. In this way, the build artifacts will have correct permissions.
1 parent 453844e commit 79ce919

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

build.assets/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,10 @@ teleterm: buildbox-teleterm
249249
docker run $(DOCKERFLAGS) $(NOROOT) $(BUILDBOX_TELETERM) \
250250
bash -c "cd $(SRCDIR) && export CONNECT_TSH_BIN_PATH=\$$PWD/../teleport/build/tsh && yarn install --frozen-lockfile && yarn build-term && yarn package-term -c.extraMetadata.version=$(CONNECT_VERSION)"
251251

252+
# Builds webassets inside Docker.
252253
.PHONY:ui
253254
ui: buildbox
254-
docker run -v "$$(pwd)/../":/teleport $(BUILDBOX) \
255+
docker run -u $(UID):$(GID) -v "$$(pwd)/../":/teleport $(BUILDBOX) \
255256
bash -c "cd ../teleport && yarn install --frozen-lockfile && yarn build-ui"
256257

257258
# grpc generates GRPC stubs from inside the buildbox

0 commit comments

Comments
 (0)