Skip to content

Commit

Permalink
fix locale(command duplicated) issue
Browse files Browse the repository at this point in the history
  • Loading branch information
BananaWanted authored and BananaWanted committed Dec 20, 2017
1 parent 36cbbdf commit 827172b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 10 deletions.
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
FROM ubuntu:xenial

ARG DEBIAN_FRONTEND=noninteractive
ENV TERM xterm-256color
ENV LC_CTYPE en_US.UTF-8

ENV TERM=xterm-256color LANG=en_US.UTF-8
RUN apt-get update \
&& apt-get install -y locales \
&& locale-gen $LANG \
&& apt-get install -y --no-install-recommends apt-utils \
&& echo reconfig locales: \
&& dpkg-reconfigure locales \
&& apt-get install -y \
lsb \
man \
Expand Down Expand Up @@ -53,7 +55,6 @@ RUN wget "https://raw.githubusercontent.com/seebi/dircolors-solarized/master/dir

COPY authorized_keys /root/.ssh/authorized_keys
COPY vimrc /root/.vimrc

COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY entrypoint.sh /entrypoint.sh

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ Put files listed below inside `/shared` to override corresponding settings.

## Know Issues
- Because Docker for Mac is running in a real virtual machine([hyperkit](https://github.com/moby/hyperkit)), after a long sleep, the hyperkit may have its clock drift, which may cause the ssh connection fails. Re-run `./start.sh` to workaround.
- Oh my zsh command duplicated on tab completion: https://github.com/sindresorhus/pure/issues/300 https://github.com/robbyrussell/oh-my-zsh/issues/4107 https://github.com/robbyrussell/oh-my-zsh/issues/3368

## TODO
- Setup node.js dev environment
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ services:
build: .
image: 4oranges/dubuntu
container_name: dubuntu
ports:
- 127.0.0.1:22:22
volumes:
- ./shared:/shared
privileged: true
5 changes: 4 additions & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#!/bin/bash

mkdir /var/run/sshd
set -x
set -e

mkdir -p /var/run/sshd
mkdir -p /shared

if [ -f /shared/sources.list ]; then ln -sf /shared/sources.list /etc/apt/sources.list; fi
Expand Down
2 changes: 0 additions & 2 deletions zshrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#!/usr/bin/env zsh
locale-gen $LANG > /dev/null

export ZSH=/root/.oh-my-zsh
export EDITOR=vim
ZSH_THEME="dubuntu"
Expand Down

0 comments on commit 827172b

Please sign in to comment.