feat(ssh): Add prefix (#182)

Signed-off-by: Ce Gao <cegao@tensorchord.ai>

pkg/lang/ir/shell.go

@@ -19,6 +19,8 @@ func (g *Graph) compileShell(root llb.State) (llb.State, error) {
 
 func (g Graph) compileZSH(root llb.State) (llb.State, error) {
  installPath := "/home/envd/install.sh"
+ zshrcPath := "/home/envd/.zshrc"
+ ohMyZSHPath := "/home/envd/.oh-my-zsh"
  m := shell.NewManager()
  g.Writer.LogZSH(compileui.ActionStart, false)
  if cached, err := m.DownloadOrCache(); err != nil {
@@ -27,10 +29,11 @@ func (g Graph) compileZSH(root llb.State) (llb.State, error) {
  g.Writer.LogZSH(compileui.ActionEnd, cached)
  }
  zshStage := root.
- File(llb.Copy(llb.Local(flag.FlagCacheDir), "oh-my-zsh", "/home/envd/.oh-my-zsh",
+ File(llb.Copy(llb.Local(flag.FlagCacheDir), "oh-my-zsh", ohMyZSHPath,
  &llb.CopyInfo{CreateDestPath: true}, llb.WithUser(defaultUID))).
  File(llb.Mkfile(installPath, 0644, []byte(m.InstallScript()), llb.WithUser(defaultUID)))
  run := zshStage.Run(llb.Shlex(fmt.Sprintf("bash %s", installPath)),
- llb.WithCustomName("install oh-my-zsh"))
- return run.Root(), nil
+ llb.WithCustomName("install oh-my-zsh")).
+ File(llb.Mkfile(zshrcPath, 0644, []byte(m.ZSHRC()), llb.WithUser(defaultUID)))
+ return run, nil
 }

pkg/shell/zsh.go

@@ -32,7 +32,11 @@ const (
 //go:embed install.sh
 var installScript string
 
+//go:embed zshrc
+var zshrc string
+
 type Manager interface {
+ ZSHRC() string
  InstallScript() string
  DownloadOrCache() (bool, error)
  OHMyZSHDir() string
@@ -49,6 +53,10 @@ func (m generalManager) InstallScript() string {
  return installScript
 }
 
+func (m generalManager) ZSHRC() string {
+ return zshrc
+}
+
 func (m generalManager) DownloadOrCache() (bool, error) {
  if home.GetManager().Cached(cacheKey) {
  logrus.WithFields(logrus.Fields{

pkg/shell/zshrc

@@ -0,0 +1,105 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+export ZSH="$HOME/.oh-my-zsh"
+
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time oh-my-zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+ZSH_THEME="robbyrussell"
+
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in $ZSH/themes/
+# If set to an empty array, this variable will have no effect.
+# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment the following line to disable bi-weekly auto-update checks.
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment the following line to automatically update without prompting.
+# DISABLE_UPDATE_PROMPT="true"
+
+# Uncomment the following line to change how often to auto-update (in days).
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS="true"
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# Caution: this setting can cause issues with multiline prompts (zsh 5.7.1 and newer seem to work)
+# See https://github.com/ohmyzsh/ohmyzsh/issues/5765
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load?
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(git ubuntu)
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+# export EDITOR='vim'
+# else
+# export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+alias zshconfig="vim ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+#
+
+# Set prompt
+export PS1="(envd 🐳) $PS1"