aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Dockerfile27
-rw-r--r--Makefile4
-rw-r--r--bashrc (renamed from zshrc)0
3 files changed, 18 insertions, 13 deletions
diff --git a/Dockerfile b/Dockerfile
index 812e3e0..7a6595e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,13 +4,10 @@ FROM alpine:3.4
RUN echo "http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
RUN echo "http://dl-4.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories
-# Makes using the terminal in container usable
-ENV TERM xterm-256color
-
# Install all the needed packages
RUN apk add --no-cache \
# My Stuff
- zsh \
+ bash \
unibilium \
php5 \
php5-json \
@@ -25,15 +22,14 @@ RUN apk add --no-cache \
neovim \
# Needed for python pip installs
musl-dev \
- gcc
+ gcc \
+ # Needed for infocmp and tic
+ ncurses
# Configure Git
RUN git config --global user.email "codyfh@gmail.com"
RUN git config --global user.name "Cody Hiar"
-# Install pip for both versions of python
-RUN python3 -m ensurepip
-
# Download composer and move it to new location
RUN curl -sS https://getcomposer.org/installer | php
RUN mv composer.phar /usr/local/bin/composer
@@ -75,11 +71,20 @@ RUN ldconfig /usr/local/lib
RUN git clone https://github.com/thornycrackers/.nvim.git /root/.config/nvim
# Install neovim Modules
-RUN nvim +PlugInstall +qa
-RUN nvim +UpdateRemotePlugins +qa
+RUN nvim +PlugInstall +qall
+RUN nvim +UpdateRemotePlugins +qall
-ADD zshrc /root/.zshrc
+# Add some aliases
+ADD bashrc /root/.bashrc
WORKDIR /app
+# Better terminal support
+ENV TERM xterm-256color
+
+# Neovim needs this so that <ctrl-h> can work
+RUN infocmp $TERM | sed 's/kbs=^[hH]/kbs=\\177/' > /tmp/$TERM.ti
+RUN tic /tmp/$TERM.ti
+
+# Command for the image
CMD ["/bin/zsh"]
diff --git a/Makefile b/Makefile
index 30ab1e0..7b597fa 100644
--- a/Makefile
+++ b/Makefile
@@ -12,13 +12,13 @@ build: ## Build the base image
docker build -t thornycrackers/neovim .
up: build ## Bring the container up
- docker run -dP -v $(CURDIR):/app --name $(CONTAINERNAME) $(IMAGENAME) /bin/zsh -c 'while true; do echo hi; sleep 1; done;'
+ docker run -dP -v $(CURDIR):/app --name $(CONTAINERNAME) $(IMAGENAME) /bin/bash -c 'while true; do echo hi; sleep 1; done;'
down: ## Stop the container
docker stop $(CONTAINERNAME) || echo 'No container to stop'
enter: ## Enter the running container
- docker exec -it $(CONTAINERNAME) /bin/zsh
+ docker exec -it $(CONTAINERNAME) /bin/bash
clean: ## Remove the image and any stopped containers
docker rm $(CONTAINERNAME) || echo 'No container to remove'
diff --git a/zshrc b/bashrc
index e8a697d..e8a697d 100644
--- a/zshrc
+++ b/bashrc