fix default cmd (bash) and locale (C.UTF-8) (#71)
Tested: rbe-{debian8,debian9,ubuntu16_04} are all tested with Google
Container Builder
diff --git a/container/experimental/rbe-debian8/BUILD b/container/experimental/rbe-debian8/BUILD
index 959c024..a90942e 100644
--- a/container/experimental/rbe-debian8/BUILD
+++ b/container/experimental/rbe-debian8/BUILD
@@ -40,8 +40,15 @@
container_image(
name = "toolchain",
base = "@debian8//image",
+ cmd = [
+ "/bin/sh",
+ "-c",
+ "/bin/bash",
+ ],
env = {
- "LC_ALL ": "C.UTF-8",
+ "LANG": "C.UTF-8",
+ "LANGUAGE": "C.UTF-8",
+ "LC_ALL": "C.UTF-8",
},
layers = [
":base-ltl",
diff --git a/container/experimental/rbe-debian9/BUILD b/container/experimental/rbe-debian9/BUILD
index e2593cd..9b6f5c8 100644
--- a/container/experimental/rbe-debian9/BUILD
+++ b/container/experimental/rbe-debian9/BUILD
@@ -37,11 +37,18 @@
toolchain_container(
name = "toolchain",
base = "@debian9//image",
+ cmd = [
+ "/bin/sh",
+ "-c",
+ "/bin/bash",
+ ],
env = {
# PATH envvar is a special case, and currently only the one in the
# topmost layer is set. So that we override it here to include all.
"PATH": "$PATH:/usr/local/go/bin",
- "LC_ALL ": "C.UTF-8",
+ "LANG": "C.UTF-8",
+ "LANGUAGE": "C.UTF-8",
+ "LC_ALL": "C.UTF-8",
},
language_layers = [
"base-ltl",
diff --git a/container/rbe-debian8/BUILD b/container/rbe-debian8/BUILD
index f405c94..84c372b 100644
--- a/container/rbe-debian8/BUILD
+++ b/container/rbe-debian8/BUILD
@@ -37,11 +37,18 @@
toolchain_container(
name = "toolchain",
base = "@debian8//image",
+ cmd = [
+ "/bin/sh",
+ "-c",
+ "/bin/bash",
+ ],
env = {
# PATH envvar is a special case, and currently only the one in the
# topmost layer is set. So that we override it here to include all.
"PATH": "$PATH:/opt/python3.6/bin:/usr/local/go/bin",
- "LC_ALL ": "C.UTF-8",
+ "LANG": "C.UTF-8",
+ "LANGUAGE": "C.UTF-8",
+ "LC_ALL": "C.UTF-8",
},
language_layers = [
"base-ltl",
diff --git a/container/rbe-ubuntu16_04/BUILD b/container/rbe-ubuntu16_04/BUILD
index d16b0af..47f169a 100644
--- a/container/rbe-ubuntu16_04/BUILD
+++ b/container/rbe-ubuntu16_04/BUILD
@@ -37,11 +37,18 @@
toolchain_container(
name = "toolchain",
base = "@ubuntu16_04//image",
+ cmd = [
+ "/bin/sh",
+ "-c",
+ "/bin/bash",
+ ],
env = {
# PATH envvar is a special case, and currently only the one in the
# topmost layer is set. So that we override it here to include all.
"PATH": "$PATH:/opt/python3.6/bin:/usr/local/go/bin",
- "LC_ALL ": "C.UTF-8",
+ "LANG": "C.UTF-8",
+ "LANGUAGE": "C.UTF-8",
+ "LC_ALL": "C.UTF-8",
},
language_layers = [
"base-ltl",
@@ -63,6 +70,8 @@
"file",
"git",
"less",
+ "locales",
+ "locales-all",
"netcat",
"openssh-client",
"patch",
diff --git a/container/test/rbe-debian8.yaml b/container/test/rbe-debian8.yaml
index a957962..b921f66 100644
--- a/container/test/rbe-debian8.yaml
+++ b/container/test/rbe-debian8.yaml
@@ -18,6 +18,9 @@
- name: 'path-envvar'
command: ['sh', '-c', 'echo $PATH']
expectedOutput: ['/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/python3.6/bin:/usr/local/go/bin']
+- name: 'check-locale'
+ command: ['sh', '-c', 'echo $LC_ALL']
+ expectedOutput: ['C.UTF-8']
- name: 'cc-envvar'
command: ['sh', '-c', 'echo $CC']
expectedOutput: ['/usr/local/bin/clang']
diff --git a/container/test/rbe-debian9.yaml b/container/test/rbe-debian9.yaml
index f040271..47592b5 100644
--- a/container/test/rbe-debian9.yaml
+++ b/container/test/rbe-debian9.yaml
@@ -18,6 +18,9 @@
- name: 'path-envvar'
command: ['sh', '-c', 'echo $PATH']
expectedOutput: ['/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin']
+- name: 'check-locale'
+ command: ['sh', '-c', 'echo $LC_ALL']
+ expectedOutput: ['C.UTF-8']
- name: 'cc-envvar'
command: ['sh', '-c', 'echo $CC']
expectedOutput: ['/usr/local/bin/clang']
diff --git a/container/test/rbe-ubuntu16_04.yaml b/container/test/rbe-ubuntu16_04.yaml
index da592e3..34ef4a5 100644
--- a/container/test/rbe-ubuntu16_04.yaml
+++ b/container/test/rbe-ubuntu16_04.yaml
@@ -18,6 +18,9 @@
- name: 'path-envvar'
command: ['sh', '-c', 'echo $PATH']
expectedOutput: ['/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/python3.6/bin:/usr/local/go/bin']
+- name: 'check-locale'
+ command: ['sh', '-c', 'echo $LC_ALL']
+ expectedOutput: ['C.UTF-8']
- name: 'cc-envvar'
command: ['sh', '-c', 'echo $CC']
expectedOutput: ['/usr/local/bin/clang']
