refs #31, #35: Support Korean input in git/shell kernel

* Adds LANG to allowed environment variable in sorna-jail. * Explicit initialize UTF-8 locale in Dockerfile.
lablup · Feb 11, 2017 · ac85b89 · ac85b89
1 parent 235f7ed
commit ac85b89
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 12 deletions.
diff --git a/bin/intra-jail b/bin/intra-jail
diff --git a/bin/intra-jail-check b/bin/intra-jail-check
diff --git a/bin/jail b/bin/jail
diff --git a/bin/jail-check b/bin/jail-check
diff --git a/git/.dockerignore b/git/.dockerignore
@@ -0,0 +1,2 @@
+node_modules
+venv
diff --git a/git/Dockerfile b/git/Dockerfile
@@ -23,7 +23,7 @@ RUN echo 'APT::Install-Recommends "false";' >> /etc/apt/apt.conf; \
 RUN apt-get update
 RUN apt-get install -y --only-upgrade tzdata
 RUN apt-get install -y build-essential git-core wget ca-certificates libseccomp2 \
-		       libreadline-dev libsqlite3-dev libssl-dev libbz2-dev libzmq3-dev tk-dev
+                       libreadline-dev libsqlite3-dev libssl-dev libbz2-dev libzmq3-dev tk-dev
 ADD install-python.sh /home/sorna/install-python.sh
 ADD pyenv-run.sh /home/sorna/pyenv-run.sh
 RUN chmod +x /home/sorna/*.sh
@@ -84,6 +84,13 @@ USER root
 RUN apt-get install -y nano vim
 RUN apt-get install -y nodejs nodejs-legacy npm
 
+# Configure the shell to use Unicode characeters
+ENV LANG en_US.UTF-8
+RUN sed -i 's/# *\(set convert-meta off\)/\1/' /etc/inputrc; \
+    locale-gen en_US.UTF-8; \
+    echo 'set hlsearch incsearch sts=4 sw=4 et' >> /etc/vim/vimrc.local; \
+    echo 'set enc=utf8 tenc=utf8' >> /etc/vim/vimrc.local
+
 # Secure installation scripts
 USER root
 # NOTE: you must copy $GOPATH/bin to <dockerfile_dir>/

diff --git a/jail/policy/default.go b/jail/policy/default.go
@@ -46,7 +46,7 @@ func (p *DefaultPolicy) GetExtraEnvs() []string {
 
 func (p *DefaultPolicy) GetPreservedEnvKeys() []string {
 	return []string{
-		"HOME", "PATH",
+		"HOME", "PATH", "LANG",
 		"PYENV_ROOT", "PYTHONPATH",
 		"LD_PRELOAD",
 	}

diff --git a/jail/policy/git.go b/jail/policy/git.go
@@ -43,7 +43,7 @@ func (p *GitPolicy) GetExtraEnvs() []string {
 
 func (p *GitPolicy) GetPreservedEnvKeys() []string {
 	return []string{
-		"HOME", "PATH",
+		"HOME", "PATH", "LANG",
 		"PYENV_ROOT", "PYTHONPATH",
 		"MPLCONFIGDIR",
 		"LD_PRELOAD",

diff --git a/jail/policy/julia.go b/jail/policy/julia.go
@@ -46,7 +46,7 @@ func (p *JuliaPolicy) GetExtraEnvs() []string {
 
 func (p *JuliaPolicy) GetPreservedEnvKeys() []string {
 	return []string{
-		"HOME", "PATH",
+		"HOME", "PATH", "LANG",
 		"PYENV_ROOT", "PYTHONPATH",
 		"PYTHONUNBUFFERED",
 		"JULIA_CPU_CORES",

diff --git a/jail/policy/python-tensorflow.go b/jail/policy/python-tensorflow.go
@@ -48,7 +48,7 @@ func (p *PythonTensorFlowPolicy) GetExtraEnvs() []string {
 
 func (p *PythonTensorFlowPolicy) GetPreservedEnvKeys() []string {
 	return []string{
-		"HOME", "PATH",
+		"HOME", "PATH", "LANG",
 		"PYENV_ROOT", "PYTHONPATH",
 		"PYTHONUNBUFFERED",
 		"MPLCONFIGDIR",

diff --git a/jail/policy/python.go b/jail/policy/python.go
@@ -42,7 +42,7 @@ func (p *PythonPolicy) GetExtraEnvs() []string {
 
 func (p *PythonPolicy) GetPreservedEnvKeys() []string {
 	return []string{
-		"HOME", "PATH",
+		"HOME", "PATH", "LANG",
 		"PYENV_ROOT", "PYTHONPATH",
 		"PYTHONUNBUFFERED",
 		"MPLCONFIGDIR",