From 9d48ef10c8c79a610264c3d29dec95e914f8b997 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 1 Feb 2025 06:27:36 +0400 Subject: [PATCH] Set UID in docker run --- .github/workflows/linux.yml | 5 +++-- Telegram/build/docker/centos_env/run.sh | 2 +- docs/building-linux.md | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 8eb20a2e55c43..eae84dc676e92 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -83,6 +83,7 @@ jobs: fi docker run --rm \ + -u $(id -u) \ -v $PWD:/usr/src/tdesktop \ -e CONFIG=Debug \ tdesktop:centos_env \ @@ -114,8 +115,8 @@ jobs: if: env.UPLOAD_ARTIFACT == 'true' run: | cd $REPO_NAME/out/Debug - sudo mkdir artifact - sudo mv {Telegram,Updater} artifact/ + mkdir artifact + mv {Telegram,Updater} artifact/ - uses: actions/upload-artifact@v4 if: env.UPLOAD_ARTIFACT == 'true' name: Upload artifact. diff --git a/Telegram/build/docker/centos_env/run.sh b/Telegram/build/docker/centos_env/run.sh index 4be3f8f03b0e3..eba4ec64679a8 100755 --- a/Telegram/build/docker/centos_env/run.sh +++ b/Telegram/build/docker/centos_env/run.sh @@ -18,4 +18,4 @@ if [ "$Command" == "" ]; then Command="bash" fi -docker run -it --rm --cpus=8 --memory=22g -v $HOME/Telegram/DesktopPrivate:/usr/src/DesktopPrivate -v $HOME/Telegram/tdesktop:/usr/src/tdesktop tdesktop:centos_env $Command +docker run -it --rm --cpus=8 --memory=22g -u $(id -u) -v $HOME/Telegram/DesktopPrivate:/usr/src/DesktopPrivate -v $HOME/Telegram/tdesktop:/usr/src/tdesktop tdesktop:centos_env $Command diff --git a/docs/building-linux.md b/docs/building-linux.md index d177798fef4ec..fbdf25355734f 100644 --- a/docs/building-linux.md +++ b/docs/building-linux.md @@ -20,6 +20,7 @@ Install [poetry](https://python-poetry.org), go to ***BuildPath*** and run Go to ***BuildPath*/tdesktop** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials)) docker run --rm -it \ + -u $(id -u) \ -v "$PWD:/usr/src/tdesktop" \ tdesktop:centos_env \ /usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \ @@ -29,6 +30,7 @@ Go to ***BuildPath*/tdesktop** and run (using [your **api_id** and **api_hash**] Or, to create a debug build, run (also using [your **api_id** and **api_hash**](#obtain-your-api-credentials)) docker run --rm -it \ + -u $(id -u) \ -v "$PWD:/usr/src/tdesktop" \ -e CONFIG=Debug \ tdesktop:centos_env \