Skip to content

Commit

Permalink
docker: update versions
Browse files Browse the repository at this point in the history
  • Loading branch information
rsteube committed Mar 10, 2024
1 parent 7d529b7 commit 65dec20
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .dockerfile/root/.bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ export STARSHIP_SHELL=bash
export LS_COLORS="$(vivid generate dracula)"
[[ ! -z $BLE ]] && source /opt/ble.sh/out/ble.sh
eval "$(starship init bash)"
source <(${TARGET} _carapace)
[[ -z "${TARGET}" ]] || source <(${TARGET} _carapace)
4 changes: 3 additions & 1 deletion .dockerfile/root/.config/elvish/rc.elv
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ set-env SHELL elvish
set-env STARSHIP_SHELL elvish
set-env LS_COLORS (vivid generate dracula)
set edit:prompt = { starship prompt }
eval ($E:TARGET _carapace|slurp)
if (has-env TARGET) {
eval ($E:TARGET _carapace|slurp)
}
2 changes: 1 addition & 1 deletion .dockerfile/root/.config/fish/config.fish
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ set STARSHIP_SHELL 'fish'
set LS_COLORS (vivid generate dracula)
starship init fish | source
mkdir -p ~/.config/fish/completions
$TARGET _carapace fish | source
set -q TARGET && $TARGET _carapace fish | source
4 changes: 3 additions & 1 deletion .dockerfile/root/.config/nushell/config.nu
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,9 @@ let light_theme = {

# External completer example
let carapace_completer = {|spans|
^$env.TARGET _carapace nushell $spans | from json
if "TARGET" in $env {
^$env.TARGET _carapace nushell $spans | from json
}
}

# The default config record. This is where much of your global configuration is setup.
Expand Down
2 changes: 1 addition & 1 deletion .dockerfile/root/.config/oil/oshrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ export SHELL='oil'
export STARSHIP_SHELL='oil'
export LS_COLORS="$(vivid generate dracula)"
PS1="$(starship prompt)"
source <(${TARGET} _carapace)
[[ -z "${TARGET}" ]] || source <(${TARGET} _carapace)
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ $env:STARSHIP_SHELL = 'powershell'
$env:LS_COLORS = (&vivid generate dracula)
Invoke-Expression (&starship init powershell)
Set-PSReadlineKeyHandler -Key Tab -Function MenuComplete
& $Env:TARGET _carapace | out-string | Invoke-Expression
if ($Env:TARGET){
& $Env:TARGET _carapace | out-string | Invoke-Expression
}
2 changes: 1 addition & 1 deletion .dockerfile/root/.config/xonsh/rc.xsh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ $STARSHIP_SHELL="xonsh"
$LS_COLORS=$(vivid generate dracula)
$PROMPT=lambda: $(starship prompt)
$COMPLETIONS_CONFIRM=True
exec($($TARGET _carapace xonsh))
'TARGET' in ${...} && exec($($TARGET _carapace xonsh))
18 changes: 9 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ RUN git clone --recursive https://github.com/akinomyoga/ble.sh.git \
&& make -C ble.sh

FROM base as elvish
ARG version=0.19.2
ARG version=0.20.1
RUN curl https://dl.elv.sh/linux-amd64/elvish-v${version}.tar.gz | tar -xvz \
&& mv elvish-* /usr/local/bin/elvish

FROM base as goreleaser
ARG version=1.21.2
ARG version=1.24.0
RUN curl -L https://github.com/goreleaser/goreleaser/releases/download/v${version}/goreleaser_Linux_x86_64.tar.gz | tar -xvz goreleaser \
&& mv goreleaser /usr/local/bin/goreleaser

Expand All @@ -33,12 +33,12 @@ FROM rsteube/ion-poc as ion-poc
# && sudo make update-shells prefix=/usr

FROM base as nushell
ARG version=0.85.0
ARG version=0.91.0
RUN curl -L https://github.com/nushell/nushell/releases/download/${version}/nu-${version}-x86_64-unknown-linux-gnu.tar.gz | tar -xvz \
&& mv nu-${version}-x86_64-unknown-linux-gnu/nu* /usr/local/bin

FROM base as oil
ARG version=0.18.0
ARG version=0.20.0
RUN apt-get update && apt-get install -y libreadline-dev
RUN curl https://www.oilshell.org/download/oil-${version}.tar.gz | tar -xvz \
&& cd oil-*/ \
Expand All @@ -47,7 +47,7 @@ RUN curl https://www.oilshell.org/download/oil-${version}.tar.gz | tar -xvz \
&& ./install

FROM base as starship
ARG version=1.16.0
ARG version=1.17.1
RUN wget -qO- "https://github.com/starship/starship/releases/download/v${version}/starship-x86_64-unknown-linux-gnu.tar.gz" | tar -xvz starship \
&& mv starship /usr/local/bin/

Expand All @@ -57,7 +57,7 @@ RUN wget -qO- "https://github.com/sharkdp/vivid/releases/download/v${version}/vi
&& mv vivid-v${version}-x86_64-unknown-linux-gnu/vivid /usr/local/bin/

FROM base as mdbook
ARG version=0.4.35
ARG version=0.4.37
RUN apt-get update && apt-get install -y unzip \
&& curl -L "https://github.com/rust-lang/mdBook/releases/download/v${version}/mdbook-v${version}-x86_64-unknown-linux-gnu.tar.gz" | tar -xvz mdbook \
&& wget -q "https://github.com/Michael-F-Bryan/mdbook-linkcheck/releases/download/v0.7.7/mdbook-linkcheck.x86_64-unknown-linux-gnu.zip" \
Expand All @@ -67,9 +67,9 @@ RUN apt-get update && apt-get install -y unzip \

FROM base
RUN apt-get update && apt-get install -y libicu72
RUN wget -q https://github.com/PowerShell/PowerShell/releases/download/v7.3.8/powershell_7.3.8-1.deb_amd64.deb\
&& dpkg -i powershell_7.3.8-1.deb_amd64.deb \
&& rm powershell_7.3.8-1.deb_amd64.deb
RUN wget -q https://github.com/PowerShell/PowerShell/releases/download/v7.4.1/powershell_7.4.1-1.deb_amd64.deb\
&& dpkg -i powershell_7.4.1-1.deb_amd64.deb \
&& rm powershell_7.4.1-1.deb_amd64.deb

RUN apt-get update \
&& apt-get install -y fish \
Expand Down

0 comments on commit 65dec20

Please sign in to comment.