pup-py commited on
Commit
dab4766
1 Parent(s): deff07e

pixi on path

Browse files
Files changed (2) hide show
  1. Dockerfile +2 -4
  2. pup +1 -4
Dockerfile CHANGED
@@ -15,7 +15,7 @@ RUN useradd -m -u 1000 user
15
  USER user
16
 
17
  ENV HOME=/home/user \
18
- PATH=/home/user/.local/bin:$PATH \
19
  PUP=/home/user/pup
20
 
21
  WORKDIR $HOME
@@ -26,10 +26,8 @@ CMD ["bash"]
26
 
27
 
28
  FROM base
29
- RUN export SHELL=bash && \
30
- curl -fsSL https://pixi.sh/install.sh | bash
31
  RUN $PUP
32
- RUN ls -la && pup which && cat .bashrc && echo $PATH
33
  RUN pup py3.11
34
 
35
  EXPOSE 7860
 
15
  USER user
16
 
17
  ENV HOME=/home/user \
18
+ PATH=/home/user/.local/bin:/home/user/.pixi/bin:$PATH \
19
  PUP=/home/user/pup
20
 
21
  WORKDIR $HOME
 
26
 
27
 
28
  FROM base
 
 
29
  RUN $PUP
30
+ RUN ls -la && pup which && echo $PATH
31
  RUN pup py3.11
32
 
33
  EXPOSE 7860
pup CHANGED
@@ -109,7 +109,7 @@ fi
109
 
110
  if [[ "$1" =~ ^py3.*$ ]]; then
111
  log_command "$0 $*"
112
- pup pixi init && source $HOME/.bashrc
113
  COMMAND="pixi add uv python=${1#py} ${@:2}"
114
  log "🐶 asked for: '$COMMAND'"
115
  $COMMAND
@@ -220,12 +220,9 @@ if [ "$1" == "pixi" ]; then
220
  if [ "$2" == "init" ]; then
221
  # install and init Pixi project in pup's home dir
222
  if ! command -v pixi &> /dev/null; then
223
- # touch $HOME/.bashrc
224
  export SHELL=bash
225
  curl -fsSL https://pixi.sh/install.sh | bash
226
- source $HOME/.bashrc
227
  fi
228
-
229
  PUPHOME=$(pup home)
230
  if [[ ! -f "$PUPHOME"/pixi.toml ]]; then
231
  pixi init "$PUPHOME"
 
109
 
110
  if [[ "$1" =~ ^py3.*$ ]]; then
111
  log_command "$0 $*"
112
+ pup pixi init
113
  COMMAND="pixi add uv python=${1#py} ${@:2}"
114
  log "🐶 asked for: '$COMMAND'"
115
  $COMMAND
 
220
  if [ "$2" == "init" ]; then
221
  # install and init Pixi project in pup's home dir
222
  if ! command -v pixi &> /dev/null; then
 
223
  export SHELL=bash
224
  curl -fsSL https://pixi.sh/install.sh | bash
 
225
  fi
 
226
  PUPHOME=$(pup home)
227
  if [[ ! -f "$PUPHOME"/pixi.toml ]]; then
228
  pixi init "$PUPHOME"