Skip to content

Commit 8514a4a

Browse files
authored
fix: locale for both dev=True/False (#2010)
Signed-off-by: Keming <kemingyang@tensorchord.ai>
1 parent 2506ede commit 8514a4a

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
lines changed

pkg/lang/ir/v1/compile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func (g *generalGraph) Compile(ctx context.Context, envPath string, pub string,
162162

163163
func (g generalGraph) GetEnviron() []string {
164164
return append(g.EnvString(),
165-
"LC_ALL=en_US.UTF-8",
165+
"LC_ALL=C.UTF-8",
166166
"LANG=C.UTF-8",
167167
)
168168
}

pkg/lang/ir/v1/conda.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929

3030
const (
3131
builderImage = "curlimages/curl:8.11.1"
32-
condaVersionDefault = "py311_24.11.1-0"
32+
condaVersionDefault = "py311_25.1.1-2"
3333
microMambaImage = "mambaorg/micromamba:2.0.6"
3434
condaRootPrefix = "/opt/conda"
3535
condaBinDir = "/opt/conda/bin"

pkg/lang/ir/v1/get_conda.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ set -euo pipefail && \
22
UNAME_M="$(uname -m)" && \
33
if [ "${UNAME_M}" = "x86_64" ]; then \
44
MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh"; \
5-
SHA256SUM="807774bae6cd87132094458217ebf713df436f64779faf9bb4c3d4b6615c1e3a"; \
5+
SHA256SUM="d8c1645776c0758214e4191c605abe5878002051316bd423f2b14b22d6cb4251"; \
66
elif [ "${UNAME_M}" = "s390x" ]; then \
77
MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-s390x.sh"; \
8-
SHA256SUM="bb499b18dbcbb2d89b22f91fe26fe661f5ed1f1944fdc743560d69cd52a2468f"; \
8+
SHA256SUM="0b4d5a3f16dcb2d230ba5dfdfdb848c854006aab6dd1bd3dbf29fcddf04b07a4"; \
99
elif [ "${UNAME_M}" = "aarch64" ]; then \
1010
MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-aarch64.sh"; \
11-
SHA256SUM="a8846ade7a5ddd9b6a6546590054d70d1c2cbe4fbe8c79fb70227e8fd93ef9f8"; \
11+
SHA256SUM="8a1d4407fce7ec552ac6ed655ce93d83549e02b819cacefbb7f640f9051e638b"; \
1212
fi && \
1313
wget "${MINICONDA_URL}" -O /tmp/miniconda.sh && \
1414
echo "${SHA256SUM} /tmp/miniconda.sh" > /tmp/shasum && \

pkg/lang/ir/v1/system.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,6 @@ func (g *generalGraph) compileDevPackages(root llb.State) llb.State {
226226
sb.WriteString("apt-get install -y --no-install-recommends --no-install-suggests --fix-missing ")
227227
sb.WriteString(strings.Join(types.BaseAptPackage, " "))
228228
sb.WriteString("&& rm -rf /var/lib/apt/lists/* ")
229-
// shell prompt
230-
sb.WriteString("&& locale-gen en_US.UTF-8")
231229

232230
run := root.Run(llb.Shlexf(`bash -c "%s"`, sb.String()),
233231
llb.WithCustomName("[internal] install built-in packages"))

pkg/types/envd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ var BaseEnvironment = []struct {
5555
}{
5656
{"DEBIAN_FRONTEND", "noninteractive"},
5757
{"PATH", DefaultSystemPath},
58-
{"LANG", "en_US.UTF-8"},
59-
{"LC_ALL", "en_US.UTF-8"},
58+
{"LANG", "C.UTF-8"},
59+
{"LC_ALL", "C.UTF-8"},
6060
}
6161
var BaseAptPackage = []string{
6262
"bash-static",

0 commit comments

Comments
 (0)