User builder in Dockerfile

ccomrade · Feb 25, 2024 · 71abb5e · 71abb5e
1 parent 8d7856d
commit 71abb5e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -49,6 +49,8 @@ jobs:
   msvc_vs2005:
     runs-on: ubuntu-latest
     container: ghcr.io/${{ github.repository }}/wine-msvc-vs2005
+    env:
+      WINEPREFIX: /home/builder/.wine
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,10 @@ RUN dpkg --add-architecture i386 \
 && apt-get install -y --no-install-recommends wine wine64 wine32:i386 winbind \
 && apt-get clean
 
+RUN adduser --disabled-password --gecos "" builder
+USER builder
+
 RUN wineboot --init && wineserver --wait
 
-ADD https://comrade.one/$TOOLCHAIN_TARBALL /
-RUN tar -xaf /$TOOLCHAIN_TARBALL -C /root/.wine/drive_c/ && rm /$TOOLCHAIN_TARBALL
+ADD --chown=builder:builder https://comrade.one/$TOOLCHAIN_TARBALL /tmp/
+RUN tar -xaf /tmp/$TOOLCHAIN_TARBALL -C /home/builder/.wine/drive_c/ && rm /tmp/$TOOLCHAIN_TARBALL