From ce06807f8450d77fb70047018a2c147afc34f5d8 Mon Sep 17 00:00:00 2001
From: Mario1159 <mario@1159.cl>
Date: Wed, 6 Sep 2023 01:04:10 -0300
Subject: [PATCH] Fix volare user and working directory

---
 base/arch.Dockerfile             | 10 ++++++----
 stacks/analog-xk/arch.Dockerfile |  9 +++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/base/arch.Dockerfile b/base/arch.Dockerfile
index 01fe0f0..070eaec 100644
--- a/base/arch.Dockerfile
+++ b/base/arch.Dockerfile
@@ -8,10 +8,6 @@ RUN pacman -Syuq --noconfirm
 # Install packages
 RUN aur-install sudo git python python-pipx xz gnu-free-fonts
 
-# Install volare
-ENV PATH="${PATH}:/root/.local/bin"
-RUN pipx install volare
-
 # Clean cache
 RUN pacman -Scc
 
@@ -19,5 +15,11 @@ RUN pacman -Scc
 RUN useradd -m designer
 RUN echo "designer ALL=(ALL:ALL) NOPASSWD: ALL" | sudo tee /etc/sudoers.d/designer
 
+# Install volare
+USER designer
+ENV PATH="${PATH}:/home/designer/.local/bin"
+RUN pipx install volare
+WORKDIR /home/designer
+
 # Initialize the enviroment keeping container alive
 CMD ["sleep", "infinity"]
\ No newline at end of file
diff --git a/stacks/analog-xk/arch.Dockerfile b/stacks/analog-xk/arch.Dockerfile
index 70dd461..5b4256e 100644
--- a/stacks/analog-xk/arch.Dockerfile
+++ b/stacks/analog-xk/arch.Dockerfile
@@ -2,13 +2,14 @@
 # Dev enviroment for analog circuits development using xschem and klayout.
 FROM osicstack-base-arch
 
+# Update packages
+RUN sudo pacman -Syuq --noconfirm
+
 # Install packages
-RUN aur-install xschem klayout
+RUN sudo aur-install xschem klayout
 
 # Clean cache
-RUN pacman -Scc
-
-USER designer
+RUN sudo pacman -Scc
 
 # Initialize the enviroment keeping container alive
 CMD ["sleep", "infinity"]
\ No newline at end of file