Skip to content

Commit a57c320

Browse files
committed
update scripts
1 parent 403f19f commit a57c320

2 files changed

Lines changed: 15 additions & 8 deletions

File tree

devcontainer/Dockerfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master
88
RUN sed -i 's/robbyrussell/eastwood/g' /root/.zshrc
99
RUN chsh -s /bin/zsh
1010

11-
# local conan repository for in-dev versions of dependencies
12-
RUN git clone https://github.com/rsl-org/conan
13-
RUN conan remote add rsl ./conan
14-
1511
# local user setup helper
1612
COPY setup_user.sh /setup_user.sh
1713
RUN chmod a+x /setup_user.sh

devcontainer/setup_user.sh

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,24 @@ if ! getent group "$LOCAL_GID" >/dev/null 2>&1; then
88
fi
99

1010
if ! id -u "$LOCAL_USER" >/dev/null 2>&1; then
11-
useradd -u "$LOCAL_UID" -g "$LOCAL_GID" -G wheel -d $LOCAL_HOME -s /bin/zsh "$LOCAL_USER"
11+
useradd -u "$LOCAL_UID" -g "$LOCAL_GID" -G wheel -d "$LOCAL_HOME" -s /bin/zsh "$LOCAL_USER"
1212
fi
1313

1414
if ! grep -q '^%wheel ALL=(ALL) NOPASSWD:ALL' /etc/sudoers; then
1515
echo '%wheel ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
1616
fi
1717

18-
chown -R $LOCAL_USER:$LOCAL_GID $LOCAL_HOME
19-
sudo -u $LOCAL_USER ZSH=$LOCAL_HOME/.oh-my-zsh sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
20-
sed -i 's/robbyrussell/eastwood/g' $LOCAL_HOME/.zshrc
18+
mkdir -p "$LOCAL_HOME"/.conan2/profiles
19+
cp /root/.conan2/profiles/* "$LOCAL_HOME"/.conan2/profiles
20+
21+
chown -R "$LOCAL_USER":"$LOCAL_USER" "$LOCAL_HOME"
22+
# local conan repository for in-dev versions of dependencies
23+
sudo -u "$LOCAL_USER" git clone https://github.com/rsl-org/conan "$LOCAL_HOME"/conan-repository
24+
sudo -u "$LOCAL_USER" conan remote add rsl "$LOCAL_HOME"/conan-repository
25+
26+
chown -R "$LOCAL_USER":"$LOCAL_GID" "$LOCAL_HOME"
27+
sudo -u "$LOCAL_USER" ZSH="$LOCAL_HOME"/.oh-my-zsh sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
28+
sed -i 's/robbyrussell/eastwood/g' "$LOCAL_HOME"/.zshrc
29+
30+
echo "export PATH=\"/usr/bin:$PATH\"" >> "$LOCAL_HOME"/.zshrc
31+
echo "export LD_LIBRARY_PATH=\"/usr/lib/x86_64-unknown-linux-gnu:$LD_LIBRARY_PATH\"" >> "$LOCAL_HOME"/.zshrc

0 commit comments

Comments
 (0)