From db45e9bbeb5e52078811968843576cdf6f6a029b Mon Sep 17 00:00:00 2001 From: Aaron Addleman Date: Fri, 16 Nov 2018 04:47:47 +0000 Subject: [PATCH 1/3] Adding spacemacs to docker image --- .gitmodules | 3 +++ Dockerfile | 5 +++-- apps/spacemacs | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 apps/spacemacs diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..8a9c8c7 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "apps/spacemacs"] + path = apps/spacemacs + url = https://github.com/syl20bnr/spacemacs diff --git a/Dockerfile b/Dockerfile index b47db2d..91faabb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER apr USER root RUN apt-get update && \ - apt-get install -y libtool-bin libffi-dev ruby ruby-dev make git autoconf pkg-config plantuml python3-pip git libtinfo-dev libzmq3-dev libcairo2-dev libpango1.0-dev libmagic-dev libblas-dev liblapack-dev nodejs wget gnupg + apt-get install -y libtool-bin libffi-dev ruby ruby-dev make git autoconf pkg-config plantuml python3-pip git libtinfo-dev libzmq3-dev libcairo2-dev libpango1.0-dev libmagic-dev libblas-dev liblapack-dev nodejs wget gnupg fonts-powerline RUN gem install ffi-rzmq iruby RUN iruby register --force RUN chown jovyan:users /home/jovyan/.ipython && chmod 740 /home/jovyan/.ipython @@ -67,6 +67,7 @@ RUN pip3 install --upgrade pip && hash -r pip RUN chown -R jovyan:users /home/jovyan /lgo USER jovyan +COPY apps/spacemacs /home/jovyan/.emacs.d RUN go get github.com/yunabe/lgo/cmd/lgo && go get -d github.com/yunabe/lgo/cmd/lgo-internal RUN go get -u github.com/nfnt/resize RUN go get -u gonum.org/v1/gonum/... @@ -86,4 +87,4 @@ RUN conda install -c conda-forge ipywidgets beakerx RUN jupyter labextension install beakerx-jupyterlab RUN python3 $GOPATH/src/github.com/yunabe/lgo/bin/install_kernel RUN node /opt/conda/lib/python3.6/site-packages/jupyterlab/staging/yarn.js install -RUN jupyter labextension install @yunabe/lgo_extension +RUN jupyter labextension install @yunabe/lgo_extension \ No newline at end of file diff --git a/apps/spacemacs b/apps/spacemacs new file mode 160000 index 0000000..c7a103a --- /dev/null +++ b/apps/spacemacs @@ -0,0 +1 @@ +Subproject commit c7a103a772d808101d7635ec10f292ab9202d9ee From 66b8cf58bb07d58f5008322ad482478790bf4325 Mon Sep 17 00:00:00 2001 From: Aaron Addleman Date: Wed, 28 Nov 2018 10:29:16 -0800 Subject: [PATCH 2/3] Update Dockerfile change ownership of /home/jovyan/.emacs.d to allow RW --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 91faabb..ce30534 100644 --- a/Dockerfile +++ b/Dockerfile @@ -68,6 +68,7 @@ RUN chown -R jovyan:users /home/jovyan /lgo USER jovyan COPY apps/spacemacs /home/jovyan/.emacs.d +RUN chown -R jovyan:users /home/jovyan/.emacs.d RUN go get github.com/yunabe/lgo/cmd/lgo && go get -d github.com/yunabe/lgo/cmd/lgo-internal RUN go get -u github.com/nfnt/resize RUN go get -u gonum.org/v1/gonum/... @@ -87,4 +88,4 @@ RUN conda install -c conda-forge ipywidgets beakerx RUN jupyter labextension install beakerx-jupyterlab RUN python3 $GOPATH/src/github.com/yunabe/lgo/bin/install_kernel RUN node /opt/conda/lib/python3.6/site-packages/jupyterlab/staging/yarn.js install -RUN jupyter labextension install @yunabe/lgo_extension \ No newline at end of file +RUN jupyter labextension install @yunabe/lgo_extension From 7ccaace424e2b39ecc30f2990dd1c26e429b166c Mon Sep 17 00:00:00 2001 From: Aaron Addleman Date: Wed, 28 Nov 2018 20:10:45 -0800 Subject: [PATCH 3/3] Update Dockerfile Move operations of spacemacs to root user --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index cce6896..d979010 100644 --- a/Dockerfile +++ b/Dockerfile @@ -65,10 +65,11 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH" RUN pip3 install --upgrade pip && hash -r pip RUN chown -R jovyan:users /home/jovyan /lgo -USER jovyan - COPY apps/spacemacs /home/jovyan/.emacs.d RUN chown -R jovyan:users /home/jovyan/.emacs.d + +USER jovyan + RUN go get github.com/yunabe/lgo/cmd/lgo && go get -d github.com/yunabe/lgo/cmd/lgo-internal RUN go get -u github.com/nfnt/resize RUN go get -u gonum.org/v1/gonum/... @@ -88,4 +89,4 @@ RUN conda install -c conda-forge ipywidgets beakerx RUN jupyter labextension install beakerx-jupyterlab RUN python3 $GOPATH/src/github.com/yunabe/lgo/bin/install_kernel RUN node /opt/conda/lib/python3.6/site-packages/jupyterlab/staging/yarn.js install -RUN jupyter labextension install @yunabe/lgo_extension \ No newline at end of file +RUN jupyter labextension install @yunabe/lgo_extension