From bd866b6c997c5f76b7751710bcd8fd8fc9a79ec8 Mon Sep 17 00:00:00 2001 From: JAremko Date: Tue, 9 May 2017 05:16:00 +0300 Subject: [PATCH] docker: add develop tag to spacemacs-docker images also fix some links --- CONTRIBUTING.org | 2 +- doc/FAQ.org | 2 +- .../spacemacs-docker/README.org | 26 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CONTRIBUTING.org b/CONTRIBUTING.org index 9032e8838..714a37f5c 100644 --- a/CONTRIBUTING.org +++ b/CONTRIBUTING.org @@ -261,4 +261,4 @@ To add tests for a layer, do the following: * Credits This =CONTRIBUTING.org= file is partially based on the [[https://github.com/rails/rails/blob/master/CONTRIBUTING.md][Rails Contribution -guidelines]] and [[https://github.com/flycheck/flycheck/blob/master/CONTRIBUTING.md][Flycheck Contribution guidelines]]. +guidelines]] and [[https://github.com/flycheck/flycheck/blob/master/doc/contributor/contributing.rst][Flycheck Contribution guidelines]]. diff --git a/doc/FAQ.org b/doc/FAQ.org index 62f4b8fe7..bf0adc542 100644 --- a/doc/FAQ.org +++ b/doc/FAQ.org @@ -579,4 +579,4 @@ If this returns =nil=, you need to install the GnuTLS DLL file in the same directory as Emacs. See [[https://www.gnu.org/software/emacs/manual/html_mono/emacs-gnutls.html#Help-For-Users][here]] for instructions. ** The powerline isn't shown correctly when Spacemacs is used within =PuTTY= -You can follow [[http://mschulte.nl/posts/using-powerline-in-PuTTY.html][this explanation]] explaining how to correct this. +You can follow [[http://webcache.googleusercontent.com/search?q=cache:CsTK3URgUr8J:mschulte.nl/nl/posts/using-powerline-in-PuTTY.html][this explanation]] explaining how to correct this. diff --git a/layers/+distributions/spacemacs-docker/README.org b/layers/+distributions/spacemacs-docker/README.org index 507822806..530377312 100644 --- a/layers/+distributions/spacemacs-docker/README.org +++ b/layers/+distributions/spacemacs-docker/README.org @@ -52,13 +52,13 @@ with GUI support on all major platforms and even [[https://i.imgur.com/wDLDMZN.g * How to setup The idea is to build your own image [[https://docs.docker.com/engine/reference/builder/#from][FROM]] the one of the provided base images -([[https://goo.gl/Rb2Als][spacemacs/emacs25]] and [[https://goo.gl/DFSenZ][spacemacs/emacs-snapshot]]). Get [[https://docs.docker.com/engine/installation][docker]] for the OS of +([[https://goo.gl/Rb2Als][spacemacs/emacs25:develop]] and [[https://goo.gl/DFSenZ][spacemacs/emacs-snapshot:develop]]). Get [[https://docs.docker.com/engine/installation][docker]] for the OS of the machine that will run development environment and then use [[https://github.com/JAremko/spacemacs-docker-seed][spacemacs-docker-seed]] as an example to create [[https://docs.docker.com/docker-hub/builds/][automated builds on Docker Hub]] or [[https://docs.docker.com/engine/reference/commandline/build/][build it locally]]. * How to use -With one of the methods below replace =spacemacs/emacs25= with your images. +With one of the methods below replace =spacemacs/emacs25:develop= with your images. NOTE: The guide assumes that you want to run Docker and connect to it from the same machine. @@ -72,7 +72,7 @@ tab and make sure you’ve got "Allow connections from network clients" ticked -e DISPLAY=$ip:0 \ -e TZ= \ -v :/mnt/workspace \ - spacemacs/emacs25 + spacemacs/emacs25:develop #+END_SRC [[https://fredrikaverpil.github.io/2016/07/31/docker-for-mac-and-gui-applications][source]], [[https://github.com/chanezon/docker-tips/blob/master/x11/README.md][another method]] @@ -88,7 +88,7 @@ Get [[https://www.cygwin.com][Cygwin]] with =xinit=, =xorg-server= and optionaly docker run --name spacemacs \ -e DISPLAY="unix$DISPLAY" \ -v :/mnt/workspace \ - spacemacs/emacs25 + spacemacs/emacs25:develop #+END_SRC Or with =-ti= via =winpty= @@ -96,7 +96,7 @@ Get [[https://www.cygwin.com][Cygwin]] with =xinit=, =xorg-server= and optionaly winpty docker run -ti --name spacemacs \ -e DISPLAY="unix$DISPLAY" \ -v :/mnt/workspace \ - spacemacs/emacs25 + spacemacs/emacs25:develop #+END_SRC [[http://manomarks.github.io/2015/12/03/docker-gui-windows.html][source]] Also You can use [[https://github.com/JAremko/docker-emacs/issues/2#issuecomment-260047233][@ninrod 's vagrant setup]] @@ -114,7 +114,7 @@ Make sure that =$DISPLAY= variable is set -v /etc/machine-id:/etc/machine-id:ro \ -v /var/run/dbus:/var/run/dbus \ -v :/mnt/workspace \ - spacemacs/emacs25 + spacemacs/emacs25:develop #+END_SRC =UID= and preferably =UNAME= should match the host's user id. You can set them in your Dockerfile with [[https://docs.docker.com/engine/reference/builder/#env][ENV statements]]. @@ -157,7 +157,7 @@ Get [[https://xpra.org/][Xpra]] client for your OS. then --volumes-from x11-bridge \ -e DISPLAY=:14 \ -e TZ= \ - spacemacs/emacs25 + spacemacs/emacs25:develop #+END_SRC Now you can connect to it with Xpra desktop client #+BEGIN_SRC sh @@ -179,19 +179,19 @@ Now you can connect to it with Xpra desktop client --volumes-from x11-bridge \ -e TZ= \ -e DISPLAY=:14 \ - spacemacs/emacs25 + spacemacs/emacs25:develop #+END_SRC Now visit http://localhost:10000/index.html?encoding=png&password= * Some basic docker commands to get you going - =docker rm -f spacemacs= - remove =spacemacs= container - =docker restart spacemacs= - restart =spacemacs= container -- =docker rmi -f spacemacs/emacs25= - remove =spacemacs/emacs25= image -- =docker pull spacemacs/emacs25= - get newer =spacemacs/emacs25= version +- =docker rmi -f spacemacs/emacs25:develop= - remove =spacemacs/emacs25:develop= image +- =docker pull spacemacs/emacs25:develop= - get newer =spacemacs/emacs25:develop= version - =docker images -a= - list all images - =docker ps -a= - list all containers -- =docker run ... spacemacs/emacs25= - run the [[https://github.com/JAremko/docker-emacs/blob/master/Dockerfile#L45][default command]] -- =docker run -ti ... spacemacs/emacs25 /bin/bash= - start bash +- =docker run ... spacemacs/emacs25:develop= - run the [[https://github.com/JAremko/docker-emacs/blob/master/Dockerfile.emacs25#L63][default command]] +- =docker run -ti ... spacemacs/emacs25:develop /bin/bash= - start bash - =docker exec spacemacs /usr/bin/emacs= - start =/usr/bin/emacs= With the running =spacemacs= container - =docker logs spacemacs= - print =spacemacs= container's logs @@ -199,5 +199,5 @@ With the running =spacemacs= container - =docker cp spacemacs:/ = - Manage data in containers with [[https://docs.docker.com/engine/tutorials/dockervolumes/][Docker volumes]]. Example - =docker volume create --name my-ws= - - =docker run ... -v my-ws:/mnt/workspace ... spacemacs/emacs25= + - =docker run ... -v my-ws:/mnt/workspace ... spacemacs/emacs25:develop= - =docker run ... -v my-ws:/home/developer/workspace ... jare/vim-bundle=