docker: added user

carapace-sh · Mar 11, 2024 · 19aaae5 · 19aaae5
1 parent b29b47f
commit 19aaae5
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 2 deletions.
diff --git a/.dockerfile/root/.bashrc → .dockerfile/home/.bashrc b/.dockerfile/root/.bashrc → .dockerfile/home/.bashrc
diff --git a/.dockerfile/root/.config/elvish/rc.elv → .dockerfile/home/.config/elvish/rc.elv b/.dockerfile/root/.config/elvish/rc.elv → .dockerfile/home/.config/elvish/rc.elv
diff --git a/.dockerfile/root/.config/fish/config.fish → .dockerfile/home/.config/fish/config.fish b/.dockerfile/root/.config/fish/config.fish → .dockerfile/home/.config/fish/config.fish
diff --git a/.dockerfile/root/.config/ion/initrc → .dockerfile/home/.config/ion/initrc b/.dockerfile/root/.config/ion/initrc → .dockerfile/home/.config/ion/initrc
diff --git a/.dockerfile/root/.config/nushell/config.nu → .dockerfile/home/.config/nushell/config.nu b/.dockerfile/root/.config/nushell/config.nu → .dockerfile/home/.config/nushell/config.nu
diff --git a/.dockerfile/root/.config/nushell/env.nu → .dockerfile/home/.config/nushell/env.nu b/.dockerfile/root/.config/nushell/env.nu → .dockerfile/home/.config/nushell/env.nu
diff --git a/.dockerfile/root/.config/nushell/starship.nu → .dockerfile/home/.config/nushell/starship.nu b/.dockerfile/root/.config/nushell/starship.nu → .dockerfile/home/.config/nushell/starship.nu
diff --git a/.dockerfile/root/.config/oil/oshrc → .dockerfile/home/.config/oil/oshrc b/.dockerfile/root/.config/oil/oshrc → .dockerfile/home/.config/oil/oshrc
diff --git a/...wershell/Microsoft.PowerShell_profile.ps1 → ...wershell/Microsoft.PowerShell_profile.ps1 b/...wershell/Microsoft.PowerShell_profile.ps1 → ...wershell/Microsoft.PowerShell_profile.ps1
diff --git a/.dockerfile/root/.config/starship.toml → .dockerfile/home/.config/starship.toml b/.dockerfile/root/.config/starship.toml → .dockerfile/home/.config/starship.toml
diff --git a/.dockerfile/root/.config/xonsh/rc.xsh → .dockerfile/home/.config/xonsh/rc.xsh b/.dockerfile/root/.config/xonsh/rc.xsh → .dockerfile/home/.config/xonsh/rc.xsh
diff --git a/.dockerfile/root/.tcshrc → .dockerfile/home/.tcshrc b/.dockerfile/root/.tcshrc → .dockerfile/home/.tcshrc
diff --git a/.dockerfile/root/.zshrc → .dockerfile/home/.zshrc b/.dockerfile/root/.zshrc → .dockerfile/home/.zshrc
diff --git a/Dockerfile b/Dockerfile
@@ -96,8 +96,14 @@ COPY --from=oil /usr/local/bin/* /usr/local/bin/
 COPY --from=starship /usr/local/bin/* /usr/local/bin/
 COPY --from=vivid /usr/local/bin/* /usr/local/bin/
 
-ADD .dockerfile/root /root
-ADD .dockerfile/usr/local/bin/* /usr/local/bin/
+RUN groupadd --gid 1000 carapace \
+ && useradd --uid 1000 --gid 1000 --create-home carapace \
+ && mkdir /.cache \
+ && chmod -R a+rwx /.cache /go
+
+COPY .dockerfile/home /root/
+COPY --chown=1000:1000 .dockerfile/home /home/carapace/
+COPY .dockerfile/usr/local/bin/* /usr/local/bin/
 
 ENV TERM xterm
 ENTRYPOINT [ "entrypoint.sh" ]
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,6 +5,7 @@ services:
     build: .
     image: ghcr.io/rsteube/carapace
     command: sh -c 'cd /carapace/example && go build -buildvcs=false .'
+    user: 1000:1000
     environment:
       TARGET: /carapace/example/example
     volumes: