Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/lang/ir/v1/conda.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (

const (
curlImage = "ghcr.io/curl/curl-container/curl-multi:8.17.0"
condaVersionDefault = "py311_25.1.1-2"
microMambaImage = "mambaorg/micromamba:2.0.6"
condaVersionDefault = "py311_25.9.1-1"
microMambaImage = "ghcr.io/mamba-org/micromamba:2.3.3-debian12-slim"
condaRootPrefix = "/opt/conda"
condaBinDir = "/opt/conda/bin"
condaSourcePath = "/tmp/miniconda.sh"
Expand Down
7 changes: 2 additions & 5 deletions pkg/lang/ir/v1/get_conda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@ set -euo pipefail && \
UNAME_M="$(uname -m)" && \
if [ "${UNAME_M}" = "x86_64" ]; then \
MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh"; \
SHA256SUM="d8c1645776c0758214e4191c605abe5878002051316bd423f2b14b22d6cb4251"; \
elif [ "${UNAME_M}" = "s390x" ]; then \
MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-s390x.sh"; \
SHA256SUM="0b4d5a3f16dcb2d230ba5dfdfdb848c854006aab6dd1bd3dbf29fcddf04b07a4"; \
SHA256SUM="238abad23f8d4d8ba89dd05df0b0079e278909a36e06955f12bbef4aa94e6131"; \
elif [ "${UNAME_M}" = "aarch64" ]; then \
MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-aarch64.sh"; \
SHA256SUM="8a1d4407fce7ec552ac6ed655ce93d83549e02b819cacefbb7f640f9051e638b"; \
SHA256SUM="4e0723b9d76aa491cf22511dac36f4fdec373e41d2a243ff875e19b8df39bf94"; \
fi && \
wget "${MINICONDA_URL}" -O /tmp/miniconda.sh && \
echo "${SHA256SUM} /tmp/miniconda.sh" > /tmp/shasum && \
Expand Down
8 changes: 4 additions & 4 deletions pkg/lang/ir/v1/julia.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
set -o pipefail && \
UNAME_M="$(uname -m)" && \
if [ "${UNAME_M}" = "x86_64" ]; then \
JULIA_URL="https://julialang-s3.julialang.org/bin/linux/x64/1.10/julia-1.10.8-linux-x86_64.tar.gz"; \
SHA256SUM="0410175aeec3df63173c15187f2083f179d40596d36fd3a57819cc5f522ae735"; \
JULIA_URL="https://julialang-s3.julialang.org/bin/linux/x64/1.10/julia-1.10.10-linux-x86_64.tar.gz"; \
SHA256SUM="6a78a03a71c7ab792e8673dc5cedb918e037f081ceb58b50971dfb7c64c5bf81"; \
elif [ "{UNAME_M}" = "aarch64" ]; then \
JULIA_URL="https://julialang-s3.julialang.org/bin/linux/aarch64/1.10/julia-1.10.8-linux-aarch64.tar.gz" \
SHA256SUM="8d63dd12595a08edc736be8d6c4fea1840f137b81c62079d970dbd1be448b8cd"; \
JULIA_URL="https://julialang-s3.julialang.org/bin/linux/aarch64/1.10/julia-1.10.10-linux-aarch64.tar.gz" \
SHA256SUM="a4b157ed68da10471ea86acc05a0ab61c1a6931ee592a9b236be227d72da50ff"; \
fi && \

wget "${JULIA_URL}" -O /tmp/julia.tar.gz && \
Expand Down
2 changes: 1 addition & 1 deletion pkg/lang/ir/v1/pixi.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
)

const (
pixiVersion = "0.48.0"
pixiVersion = "0.59.0"
pixiConfigTemplate = `
{{- if .UsePixiMirror -}}
[mirrors]
Expand Down
15 changes: 8 additions & 7 deletions pkg/lang/ir/v1/shell.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ symbol = "Conda "
[nodejs]
symbol = "NodeJS "

[go]
[golang]
symbol = "Go "

[rust]
Expand Down Expand Up @@ -77,8 +77,8 @@ renamed = "r"
deleted = "x"
`

fishVersion = "4.0.1"
fishAssetURL = "https://github.com/fish-shell/fish-shell/releases/download/%[1]s/fish-static-$(uname -m)-%[1]s.tar.xz"
fishVersion = "4.2.0"
fishAssetURL = "https://github.com/fish-shell/fish-shell/releases/download/%[1]s/fish-%[1]s-linux-$(uname -m).tar.xz"
)

func (g *generalGraph) compileShell(root llb.State) (_ llb.State, err error) {
Expand Down Expand Up @@ -203,9 +203,10 @@ func (g generalGraph) compileFish(root llb.State) llb.State {
).Root()
root = root.File(
llb.Copy(builder, "/tmp/fish", "/usr/bin/fish"),
llb.WithCustomName("[internal] copy fish shell from the builder image")).
Run(llb.Shlex(`sh -c "echo yes | fish --install"`),
llb.WithCustomName("[internal] install fish shell")).Root()

llb.WithCustomName("[internal] install fish shell"),
).Run(
llb.Shlexf(`sh -c "mkdir -p %s"`, fileutil.EnvdHomeDir(".config/fish")),
llb.WithCustomName("[internal] init fish config dir"),
).Root()
return root
}
2 changes: 1 addition & 1 deletion pkg/lang/ir/v1/uv.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package v1
import "github.com/moby/buildkit/client/llb"

const (
uvVersion = "0.7.10"
uvVersion = "0.9.8"
)

func (g generalGraph) compileUV(root llb.State) llb.State {
Expand Down
Loading